diff options
Diffstat (limited to 'chrome/browser/apps')
7 files changed, 15 insertions, 9 deletions
diff --git a/chrome/browser/apps/app_shim/app_shim_handler_mac.cc b/chrome/browser/apps/app_shim/app_shim_handler_mac.cc index c7801ad..8b55be1 100644 --- a/chrome/browser/apps/app_shim/app_shim_handler_mac.cc +++ b/chrome/browser/apps/app_shim/app_shim_handler_mac.cc @@ -35,8 +35,9 @@ void TerminateIfNoAppWindows() { class AppShimHandlerRegistry : public content::NotificationObserver { public: static AppShimHandlerRegistry* GetInstance() { - return Singleton<AppShimHandlerRegistry, - LeakySingletonTraits<AppShimHandlerRegistry> >::get(); + return base::Singleton< + AppShimHandlerRegistry, + base::LeakySingletonTraits<AppShimHandlerRegistry>>::get(); } AppShimHandler* GetForAppMode(const std::string& app_mode_id) const { @@ -74,7 +75,7 @@ class AppShimHandlerRegistry : public content::NotificationObserver { } private: - friend struct DefaultSingletonTraits<AppShimHandlerRegistry>; + friend struct base::DefaultSingletonTraits<AppShimHandlerRegistry>; typedef std::map<std::string, AppShimHandler*> HandlerMap; AppShimHandlerRegistry() diff --git a/chrome/browser/apps/ephemeral_app_service_factory.cc b/chrome/browser/apps/ephemeral_app_service_factory.cc index 18ecb08..06a7c02 100644 --- a/chrome/browser/apps/ephemeral_app_service_factory.cc +++ b/chrome/browser/apps/ephemeral_app_service_factory.cc @@ -22,7 +22,7 @@ EphemeralAppServiceFactory::GetForProfile(Profile* profile) { // static EphemeralAppServiceFactory* EphemeralAppServiceFactory::GetInstance() { - return Singleton<EphemeralAppServiceFactory>::get(); + return base::Singleton<EphemeralAppServiceFactory>::get(); } EphemeralAppServiceFactory::EphemeralAppServiceFactory() diff --git a/chrome/browser/apps/ephemeral_app_service_factory.h b/chrome/browser/apps/ephemeral_app_service_factory.h index ea9b0eb..412027e 100644 --- a/chrome/browser/apps/ephemeral_app_service_factory.h +++ b/chrome/browser/apps/ephemeral_app_service_factory.h @@ -18,7 +18,7 @@ class EphemeralAppServiceFactory : public BrowserContextKeyedServiceFactory { static EphemeralAppServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<EphemeralAppServiceFactory>; + friend struct base::DefaultSingletonTraits<EphemeralAppServiceFactory>; EphemeralAppServiceFactory(); ~EphemeralAppServiceFactory() override; diff --git a/chrome/browser/apps/per_app_settings_service_factory.cc b/chrome/browser/apps/per_app_settings_service_factory.cc index c7f008d..40704bd 100644 --- a/chrome/browser/apps/per_app_settings_service_factory.cc +++ b/chrome/browser/apps/per_app_settings_service_factory.cc @@ -11,7 +11,7 @@ // static PerAppSettingsServiceFactory* PerAppSettingsServiceFactory::GetInstance() { - return Singleton<PerAppSettingsServiceFactory>::get(); + return base::Singleton<PerAppSettingsServiceFactory>::get(); } // static diff --git a/chrome/browser/apps/per_app_settings_service_factory.h b/chrome/browser/apps/per_app_settings_service_factory.h index 1111848..23ee62b 100644 --- a/chrome/browser/apps/per_app_settings_service_factory.h +++ b/chrome/browser/apps/per_app_settings_service_factory.h @@ -13,7 +13,10 @@ class BrowserContext; class PerAppSettingsService; +namespace base { template <typename T> struct DefaultSingletonTraits; +} + class PerAppSettingsServiceFactory : public BrowserContextKeyedServiceFactory { public: static PerAppSettingsServiceFactory* GetInstance(); @@ -21,7 +24,7 @@ class PerAppSettingsServiceFactory : public BrowserContextKeyedServiceFactory { content::BrowserContext* browser_context); private: - friend struct DefaultSingletonTraits<PerAppSettingsServiceFactory>; + friend struct base::DefaultSingletonTraits<PerAppSettingsServiceFactory>; PerAppSettingsServiceFactory(); ~PerAppSettingsServiceFactory() override; diff --git a/chrome/browser/apps/shortcut_manager_factory.cc b/chrome/browser/apps/shortcut_manager_factory.cc index 06839ce..1327901 100644 --- a/chrome/browser/apps/shortcut_manager_factory.cc +++ b/chrome/browser/apps/shortcut_manager_factory.cc @@ -17,7 +17,7 @@ AppShortcutManager* AppShortcutManagerFactory::GetForProfile(Profile* profile) { } AppShortcutManagerFactory* AppShortcutManagerFactory::GetInstance() { - return Singleton<AppShortcutManagerFactory>::get(); + return base::Singleton<AppShortcutManagerFactory>::get(); } AppShortcutManagerFactory::AppShortcutManagerFactory() diff --git a/chrome/browser/apps/shortcut_manager_factory.h b/chrome/browser/apps/shortcut_manager_factory.h index 0c8f97c..1cb6e06 100644 --- a/chrome/browser/apps/shortcut_manager_factory.h +++ b/chrome/browser/apps/shortcut_manager_factory.h @@ -7,7 +7,9 @@ #include "components/keyed_service/content/browser_context_keyed_service_factory.h" +namespace base { template<typename Type> struct DefaultSingletonTraits; +} class Profile; @@ -24,7 +26,7 @@ class AppShortcutManagerFactory : public BrowserContextKeyedServiceFactory { static AppShortcutManagerFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<AppShortcutManagerFactory>; + friend struct base::DefaultSingletonTraits<AppShortcutManagerFactory>; AppShortcutManagerFactory(); ~AppShortcutManagerFactory() override; |