diff options
author | Zach Hilman <zachhilman@gmail.com> | 2018-12-24 22:22:07 +0100 |
---|---|---|
committer | Zach Hilman <zachhilman@gmail.com> | 2018-12-28 21:32:39 +0100 |
commit | 32bfa92c7137d20f2c105595831b3c8cefe40326 (patch) | |
tree | 58915a61c31a5e2c967d866c1fc6099e21a042da | |
parent | frontend: Add frontend responder for web browser (diff) | |
download | yuzu-32bfa92c7137d20f2c105595831b3c8cefe40326.tar yuzu-32bfa92c7137d20f2c105595831b3c8cefe40326.tar.gz yuzu-32bfa92c7137d20f2c105595831b3c8cefe40326.tar.bz2 yuzu-32bfa92c7137d20f2c105595831b3c8cefe40326.tar.lz yuzu-32bfa92c7137d20f2c105595831b3c8cefe40326.tar.xz yuzu-32bfa92c7137d20f2c105595831b3c8cefe40326.tar.zst yuzu-32bfa92c7137d20f2c105595831b3c8cefe40326.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/core/core.cpp | 13 | ||||
-rw-r--r-- | src/core/core.h | 7 | ||||
-rw-r--r-- | src/core/hle/service/am/applets/profile_select.cpp | 2 |
4 files changed, 22 insertions, 2 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 82c934f7e..94a576508 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -87,6 +87,8 @@ add_library(core STATIC frontend/applets/profile_select.h frontend/applets/software_keyboard.cpp frontend/applets/software_keyboard.h + frontend/applets/web_browser.cpp + frontend/applets/web_browser.h frontend/emu_window.cpp frontend/emu_window.h frontend/framebuffer_layout.cpp diff --git a/src/core/core.cpp b/src/core/core.cpp index fd10199ec..373dff2e6 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -31,7 +31,9 @@ #include "core/loader/loader.h" #include "core/perf_stats.h" #include "core/telemetry_session.h" +#include "frontend/applets/profile_select.h" #include "frontend/applets/software_keyboard.h" +#include "frontend/applets/web_browser.h" #include "video_core/debug_utils/debug_utils.h" #include "video_core/gpu.h" #include "video_core/renderer_base.h" @@ -103,6 +105,8 @@ struct System::Impl { profile_selector = std::make_unique<Core::Frontend::DefaultProfileSelectApplet>(); if (software_keyboard == nullptr) software_keyboard = std::make_unique<Core::Frontend::DefaultSoftwareKeyboardApplet>(); + if (web_browser == nullptr) + web_browser = std::make_unique<Core::Frontend::DefaultWebBrowserApplet>(); auto main_process = Kernel::Process::Create(kernel, "main"); kernel.MakeCurrentProcess(main_process.get()); @@ -233,6 +237,7 @@ struct System::Impl { /// Frontend applets std::unique_ptr<Core::Frontend::ProfileSelectApplet> profile_selector; std::unique_ptr<Core::Frontend::SoftwareKeyboardApplet> software_keyboard; + std::unique_ptr<Core::Frontend::WebBrowserApplet> web_browser; /// Service manager std::shared_ptr<Service::SM::ServiceManager> service_manager; @@ -443,6 +448,14 @@ const Core::Frontend::SoftwareKeyboardApplet& System::GetSoftwareKeyboard() cons return *impl->software_keyboard; } +void System::SetWebBrowser(std::unique_ptr<Core::Frontend::WebBrowserApplet> applet) { + impl->web_browser = std::move(applet); +} + +const Core::Frontend::WebBrowserApplet& System::GetWebBrowser() const { + return *impl->web_browser; +} + System::ResultStatus System::Init(Frontend::EmuWindow& emu_window) { return impl->Init(*this, emu_window); } diff --git a/src/core/core.h b/src/core/core.h index 869921493..a53dbb4d4 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -11,11 +11,12 @@ #include "common/common_types.h" #include "core/file_sys/vfs_types.h" #include "core/hle/kernel/object.h" -#include "frontend/applets/profile_select.h" namespace Core::Frontend { class EmuWindow; +class ProfileSelectApplet; class SoftwareKeyboardApplet; +class WebBrowserApplet; } // namespace Core::Frontend namespace FileSys { @@ -250,6 +251,10 @@ public: const Core::Frontend::SoftwareKeyboardApplet& GetSoftwareKeyboard() const; + void SetWebBrowser(std::unique_ptr<Core::Frontend::WebBrowserApplet> applet); + + const Core::Frontend::WebBrowserApplet& GetWebBrowser() const; + private: System(); diff --git a/src/core/hle/service/am/applets/profile_select.cpp b/src/core/hle/service/am/applets/profile_select.cpp index 4c7b45454..14e2a1fee 100644 --- a/src/core/hle/service/am/applets/profile_select.cpp +++ b/src/core/hle/service/am/applets/profile_select.cpp @@ -7,7 +7,7 @@ #include "common/assert.h" #include "common/string_util.h" #include "core/core.h" -#include "core/frontend/applets/software_keyboard.h" +#include "core/frontend/applets/profile_select.h" #include "core/hle/service/am/am.h" #include "core/hle/service/am/applets/profile_select.h" |