diff options
| author | 2022-12-05 18:46:57 -0500 | |
|---|---|---|
| committer | 2022-12-05 19:06:04 -0500 | |
| commit | e26c86a6e78f00ce6641fc65e7076cacc91e2137 (patch) | |
| tree | 97bd3cd0380855f3931f28694ea19197e4611f79 /src/core/frontend/applets | |
| parent | applets/software_keyboard: Use aliases for callbacks (diff) | |
| download | yuzu-e26c86a6e78f00ce6641fc65e7076cacc91e2137.tar.gz yuzu-e26c86a6e78f00ce6641fc65e7076cacc91e2137.tar.xz yuzu-e26c86a6e78f00ce6641fc65e7076cacc91e2137.zip | |
applets/web_browser: Use aliases for callbacks
Deduplicates a lot of long callback declarations
Diffstat (limited to 'src/core/frontend/applets')
| -rw-r--r-- | src/core/frontend/applets/web_browser.cpp | 11 | ||||
| -rw-r--r-- | src/core/frontend/applets/web_browser.h | 24 |
2 files changed, 17 insertions, 18 deletions
diff --git a/src/core/frontend/applets/web_browser.cpp b/src/core/frontend/applets/web_browser.cpp index 27c7086be..b09cb7102 100644 --- a/src/core/frontend/applets/web_browser.cpp +++ b/src/core/frontend/applets/web_browser.cpp | |||
| @@ -10,18 +10,17 @@ WebBrowserApplet::~WebBrowserApplet() = default; | |||
| 10 | 10 | ||
| 11 | DefaultWebBrowserApplet::~DefaultWebBrowserApplet() = default; | 11 | DefaultWebBrowserApplet::~DefaultWebBrowserApplet() = default; |
| 12 | 12 | ||
| 13 | void DefaultWebBrowserApplet::OpenLocalWebPage( | 13 | void DefaultWebBrowserApplet::OpenLocalWebPage(const std::string& local_url, |
| 14 | const std::string& local_url, std::function<void()> extract_romfs_callback, | 14 | ExtractROMFSCallback extract_romfs_callback, |
| 15 | std::function<void(Service::AM::Applets::WebExitReason, std::string)> callback) const { | 15 | OpenWebPageCallback callback) const { |
| 16 | LOG_WARNING(Service_AM, "(STUBBED) called, backend requested to open local web page at {}", | 16 | LOG_WARNING(Service_AM, "(STUBBED) called, backend requested to open local web page at {}", |
| 17 | local_url); | 17 | local_url); |
| 18 | 18 | ||
| 19 | callback(Service::AM::Applets::WebExitReason::WindowClosed, "http://localhost/"); | 19 | callback(Service::AM::Applets::WebExitReason::WindowClosed, "http://localhost/"); |
| 20 | } | 20 | } |
| 21 | 21 | ||
| 22 | void DefaultWebBrowserApplet::OpenExternalWebPage( | 22 | void DefaultWebBrowserApplet::OpenExternalWebPage(const std::string& external_url, |
| 23 | const std::string& external_url, | 23 | OpenWebPageCallback callback) const { |
| 24 | std::function<void(Service::AM::Applets::WebExitReason, std::string)> callback) const { | ||
| 25 | LOG_WARNING(Service_AM, "(STUBBED) called, backend requested to open external web page at {}", | 24 | LOG_WARNING(Service_AM, "(STUBBED) called, backend requested to open external web page at {}", |
| 26 | external_url); | 25 | external_url); |
| 27 | 26 | ||
diff --git a/src/core/frontend/applets/web_browser.h b/src/core/frontend/applets/web_browser.h index 1411274f8..4f72284ad 100644 --- a/src/core/frontend/applets/web_browser.h +++ b/src/core/frontend/applets/web_browser.h | |||
| @@ -11,29 +11,29 @@ namespace Core::Frontend { | |||
| 11 | 11 | ||
| 12 | class WebBrowserApplet { | 12 | class WebBrowserApplet { |
| 13 | public: | 13 | public: |
| 14 | using ExtractROMFSCallback = std::function<void()>; | ||
| 15 | using OpenWebPageCallback = | ||
| 16 | std::function<void(Service::AM::Applets::WebExitReason, std::string)>; | ||
| 17 | |||
| 14 | virtual ~WebBrowserApplet(); | 18 | virtual ~WebBrowserApplet(); |
| 15 | 19 | ||
| 16 | virtual void OpenLocalWebPage( | 20 | virtual void OpenLocalWebPage(const std::string& local_url, |
| 17 | const std::string& local_url, std::function<void()> extract_romfs_callback, | 21 | ExtractROMFSCallback extract_romfs_callback, |
| 18 | std::function<void(Service::AM::Applets::WebExitReason, std::string)> callback) const = 0; | 22 | OpenWebPageCallback callback) const = 0; |
| 19 | 23 | ||
| 20 | virtual void OpenExternalWebPage( | 24 | virtual void OpenExternalWebPage(const std::string& external_url, |
| 21 | const std::string& external_url, | 25 | OpenWebPageCallback callback) const = 0; |
| 22 | std::function<void(Service::AM::Applets::WebExitReason, std::string)> callback) const = 0; | ||
| 23 | }; | 26 | }; |
| 24 | 27 | ||
| 25 | class DefaultWebBrowserApplet final : public WebBrowserApplet { | 28 | class DefaultWebBrowserApplet final : public WebBrowserApplet { |
| 26 | public: | 29 | public: |
| 27 | ~DefaultWebBrowserApplet() override; | 30 | ~DefaultWebBrowserApplet() override; |
| 28 | 31 | ||
| 29 | void OpenLocalWebPage(const std::string& local_url, | 32 | void OpenLocalWebPage(const std::string& local_url, ExtractROMFSCallback extract_romfs_callback, |
| 30 | std::function<void()> extract_romfs_callback, | 33 | OpenWebPageCallback callback) const override; |
| 31 | std::function<void(Service::AM::Applets::WebExitReason, std::string)> | ||
| 32 | callback) const override; | ||
| 33 | 34 | ||
| 34 | void OpenExternalWebPage(const std::string& external_url, | 35 | void OpenExternalWebPage(const std::string& external_url, |
| 35 | std::function<void(Service::AM::Applets::WebExitReason, std::string)> | 36 | OpenWebPageCallback callback) const override; |
| 36 | callback) const override; | ||
| 37 | }; | 37 | }; |
| 38 | 38 | ||
| 39 | } // namespace Core::Frontend | 39 | } // namespace Core::Frontend |