1 files changed, 31 insertions, 13 deletions

diff --git a/src/core/core.h b/src/core/core.h
index ba76a41d8..20959de54 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -14,12 +14,13 @@
 
 namespace Core::Frontend {
 class EmuWindow;
-class ProfileSelectApplet;
-class SoftwareKeyboardApplet;
-class WebBrowserApplet;
 } // namespace Core::Frontend
 
 namespace FileSys {
+class CheatList;
+class ContentProvider;
+class ContentProviderUnion;
+enum class ContentProviderUnionSlot;
 class VfsFilesystem;
 } // namespace FileSys
 
@@ -34,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;
@@ -88,7 +98,6 @@ public:
         Success,             ///< Succeeded
         ErrorNotInitialized, ///< Error trying to use core prior to initialization
         ErrorGetLoader,      ///< Error finding the correct application loader
-        ErrorSystemMode,     ///< Error determining the system mode
         ErrorSystemFiles,    ///< Error in finding system files
         ErrorSharedFont,     ///< Error in finding shared font
         ErrorVideoCore,      ///< Error in the video core
@@ -253,18 +262,27 @@ public:
 
     std::shared_ptr<FileSys::VfsFilesystem> GetFilesystem() const;
 
-    void SetProfileSelector(std::unique_ptr<Frontend::ProfileSelectApplet> applet);
+    void RegisterCheatList(const std::vector<FileSys::CheatList>& list, const std::string& build_id,
+                           VAddr code_region_start, VAddr code_region_end);
+
+    void SetAppletFrontendSet(Service::AM::Applets::AppletFrontendSet&& set);
+
+    void SetDefaultAppletFrontendSet();
+
+    Service::AM::Applets::AppletManager& GetAppletManager();
+
+    const Service::AM::Applets::AppletManager& GetAppletManager() const;
 
-    const Frontend::ProfileSelectApplet& GetProfileSelector() const;
+    void SetContentProvider(std::unique_ptr<FileSys::ContentProviderUnion> provider);
 
-    void SetSoftwareKeyboard(std::unique_ptr<Frontend::SoftwareKeyboardApplet> applet);
+    FileSys::ContentProvider& GetContentProvider();
 
-    const Frontend::SoftwareKeyboardApplet& GetSoftwareKeyboard() const;
+    const FileSys::ContentProvider& GetContentProvider() const;
 
-    void SetWebBrowser(std::unique_ptr<Frontend::WebBrowserApplet> applet);
+    void RegisterContentProvider(FileSys::ContentProviderUnionSlot slot,
+                                 FileSys::ContentProvider* provider);
 
-    Frontend::WebBrowserApplet& GetWebBrowser();
-    const Frontend::WebBrowserApplet& GetWebBrowser() const;
+    void ClearContentProvider(FileSys::ContentProviderUnionSlot slot);
 
 private:
     System();