diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2019-03-11 19:33:49 -0400 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2019-04-17 11:35:24 -0400 |
| commit | ec0bc3061e674c70958f97b1fad3dbeb8145d3f6 (patch) | |
| tree | 48de5c628cad354dbc3361ef689b94abdaf17b6b /src/core/core.h | |
| parent | 6cea62b756fd32f54fca62a945e79f2ce44752bc (diff) | |
core: Remove specific applets in favor of AppletManager
Diffstat (limited to 'src/core/core.h')
| -rw-r--r-- | src/core/core.h | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/core/core.h b/src/core/core.h index 82b2e087e2..a9a756a4c0 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -14,9 +14,6 @@ namespace Core::Frontend { class EmuWindow; -class ProfileSelectApplet; -class SoftwareKeyboardApplet; -class WebBrowserApplet; } // namespace Core::Frontend namespace FileSys { @@ -38,9 +35,18 @@ class AppLoader; enum class ResultStatus : u16; } // namespace Loader -namespace Service::SM { +namespace Service { + +namespace AM::Applets { +struct AppletFrontendSet; +class AppletManager; +} // namespace AM::Applets + +namespace SM { class ServiceManager; -} // namespace Service::SM +} // namespace SM + +} // namespace Service namespace Tegra { class DebugContext; @@ -260,18 +266,13 @@ public: void RegisterCheatList(const std::vector<FileSys::CheatList>& list, const std::string& build_id, VAddr code_region_start, VAddr code_region_end); - void SetProfileSelector(std::unique_ptr<Frontend::ProfileSelectApplet> applet); - - const Frontend::ProfileSelectApplet& GetProfileSelector() const; - - void SetSoftwareKeyboard(std::unique_ptr<Frontend::SoftwareKeyboardApplet> applet); + void SetAppletFrontendSet(Service::AM::Applets::AppletFrontendSet&& set); - const Frontend::SoftwareKeyboardApplet& GetSoftwareKeyboard() const; + void SetDefaultAppletFrontendSet(); - void SetWebBrowser(std::unique_ptr<Frontend::WebBrowserApplet> applet); + Service::AM::Applets::AppletManager& GetAppletManager(); - Frontend::WebBrowserApplet& GetWebBrowser(); - const Frontend::WebBrowserApplet& GetWebBrowser() const; + const Service::AM::Applets::AppletManager& GetAppletManager() const; void SetContentProvider(std::unique_ptr<FileSys::ContentProviderUnion> provider); |