diff options
author | bunnei <bunneidev@gmail.com> | 2019-06-26 21:55:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-26 21:55:24 +0200 |
commit | 5829ba1ccc18c083a4d2a6e42ad27ebe1c6fbac8 (patch) | |
tree | 63d9887d2160fe6064f1d2b09b09553c4c8d9fce /src/core/hle/service/am/applets/applets.h | |
parent | Merge pull request #2607 from DarkLordZach/arp-1 (diff) | |
parent | applets: Pass current process title ID to applets (diff) | |
download | yuzu-5829ba1ccc18c083a4d2a6e42ad27ebe1c6fbac8.tar yuzu-5829ba1ccc18c083a4d2a6e42ad27ebe1c6fbac8.tar.gz yuzu-5829ba1ccc18c083a4d2a6e42ad27ebe1c6fbac8.tar.bz2 yuzu-5829ba1ccc18c083a4d2a6e42ad27ebe1c6fbac8.tar.lz yuzu-5829ba1ccc18c083a4d2a6e42ad27ebe1c6fbac8.tar.xz yuzu-5829ba1ccc18c083a4d2a6e42ad27ebe1c6fbac8.tar.zst yuzu-5829ba1ccc18c083a4d2a6e42ad27ebe1c6fbac8.zip |
Diffstat (limited to 'src/core/hle/service/am/applets/applets.h')
-rw-r--r-- | src/core/hle/service/am/applets/applets.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/core/hle/service/am/applets/applets.h b/src/core/hle/service/am/applets/applets.h index 05ae739ca..adc973dad 100644 --- a/src/core/hle/service/am/applets/applets.h +++ b/src/core/hle/service/am/applets/applets.h @@ -13,7 +13,9 @@ union ResultCode; namespace Core::Frontend { +class ECommerceApplet; class ErrorApplet; +class ParentalControlsApplet; class PhotoViewerApplet; class ProfileSelectApplet; class SoftwareKeyboardApplet; @@ -145,15 +147,19 @@ protected: }; struct AppletFrontendSet { + using ParentalControlsApplet = std::unique_ptr<Core::Frontend::ParentalControlsApplet>; using ErrorApplet = std::unique_ptr<Core::Frontend::ErrorApplet>; using PhotoViewer = std::unique_ptr<Core::Frontend::PhotoViewerApplet>; using ProfileSelect = std::unique_ptr<Core::Frontend::ProfileSelectApplet>; using SoftwareKeyboard = std::unique_ptr<Core::Frontend::SoftwareKeyboardApplet>; using WebBrowser = std::unique_ptr<Core::Frontend::WebBrowserApplet>; + using ECommerceApplet = std::unique_ptr<Core::Frontend::ECommerceApplet>; AppletFrontendSet(); - AppletFrontendSet(ErrorApplet error, PhotoViewer photo_viewer, ProfileSelect profile_select, - SoftwareKeyboard software_keyboard, WebBrowser web_browser); + AppletFrontendSet(ParentalControlsApplet parental_controls, ErrorApplet error, + PhotoViewer photo_viewer, ProfileSelect profile_select, + SoftwareKeyboard software_keyboard, WebBrowser web_browser, + ECommerceApplet e_commerce); ~AppletFrontendSet(); AppletFrontendSet(const AppletFrontendSet&) = delete; @@ -162,11 +168,13 @@ struct AppletFrontendSet { AppletFrontendSet(AppletFrontendSet&&) noexcept; AppletFrontendSet& operator=(AppletFrontendSet&&) noexcept; + ParentalControlsApplet parental_controls; ErrorApplet error; PhotoViewer photo_viewer; ProfileSelect profile_select; SoftwareKeyboard software_keyboard; WebBrowser web_browser; + ECommerceApplet e_commerce; }; class AppletManager { @@ -179,7 +187,7 @@ public: void SetDefaultAppletsIfMissing(); void ClearAll(); - std::shared_ptr<Applet> GetApplet(AppletId id) const; + std::shared_ptr<Applet> GetApplet(AppletId id, u64 current_process_title_id) const; private: AppletFrontendSet frontend; |