diff options
Diffstat (limited to 'chrome/browser/chromeos/extensions')
6 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router_factory.cc b/chrome/browser/chromeos/extensions/file_manager/event_router_factory.cc index 80fd18b..62b8f0e 100644 --- a/chrome/browser/chromeos/extensions/file_manager/event_router_factory.cc +++ b/chrome/browser/chromeos/extensions/file_manager/event_router_factory.cc @@ -23,7 +23,7 @@ EventRouter* EventRouterFactory::GetForProfile(Profile* profile) { // static EventRouterFactory* EventRouterFactory::GetInstance() { - return Singleton<EventRouterFactory>::get(); + return base::Singleton<EventRouterFactory>::get(); } EventRouterFactory::EventRouterFactory() diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router_factory.h b/chrome/browser/chromeos/extensions/file_manager/event_router_factory.h index e30de225..40d5bff 100644 --- a/chrome/browser/chromeos/extensions/file_manager/event_router_factory.h +++ b/chrome/browser/chromeos/extensions/file_manager/event_router_factory.h @@ -31,7 +31,7 @@ class EventRouterFactory : public BrowserContextKeyedServiceFactory { bool ServiceIsNULLWhileTesting() const override; private: - friend struct DefaultSingletonTraits<EventRouterFactory>; + friend struct base::DefaultSingletonTraits<EventRouterFactory>; EventRouterFactory(); ~EventRouterFactory() override; diff --git a/chrome/browser/chromeos/extensions/install_limiter_factory.cc b/chrome/browser/chromeos/extensions/install_limiter_factory.cc index e93d54a..aeb869b 100644 --- a/chrome/browser/chromeos/extensions/install_limiter_factory.cc +++ b/chrome/browser/chromeos/extensions/install_limiter_factory.cc @@ -20,7 +20,7 @@ InstallLimiter* InstallLimiterFactory::GetForProfile(Profile* profile) { // static InstallLimiterFactory* InstallLimiterFactory::GetInstance() { - return Singleton<InstallLimiterFactory>::get(); + return base::Singleton<InstallLimiterFactory>::get(); } InstallLimiterFactory::InstallLimiterFactory() diff --git a/chrome/browser/chromeos/extensions/install_limiter_factory.h b/chrome/browser/chromeos/extensions/install_limiter_factory.h index 2f7981e..66aeba0 100644 --- a/chrome/browser/chromeos/extensions/install_limiter_factory.h +++ b/chrome/browser/chromeos/extensions/install_limiter_factory.h @@ -24,7 +24,7 @@ class InstallLimiterFactory : public BrowserContextKeyedServiceFactory { static InstallLimiterFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<InstallLimiterFactory>; + friend struct base::DefaultSingletonTraits<InstallLimiterFactory>; InstallLimiterFactory(); ~InstallLimiterFactory() override; diff --git a/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.cc b/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.cc index 0fe48db..115403e 100644 --- a/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.cc +++ b/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.cc @@ -23,7 +23,7 @@ UsersPrivateDelegate* UsersPrivateDelegateFactory::GetForBrowserContext( // static UsersPrivateDelegateFactory* UsersPrivateDelegateFactory::GetInstance() { - return Singleton<UsersPrivateDelegateFactory>::get(); + return base::Singleton<UsersPrivateDelegateFactory>::get(); } UsersPrivateDelegateFactory::UsersPrivateDelegateFactory() diff --git a/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.h b/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.h index 93d88ad7..32d493a 100644 --- a/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.h +++ b/chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.h @@ -24,7 +24,7 @@ class UsersPrivateDelegateFactory : public BrowserContextKeyedServiceFactory { static UsersPrivateDelegateFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<UsersPrivateDelegateFactory>; + friend struct base::DefaultSingletonTraits<UsersPrivateDelegateFactory>; UsersPrivateDelegateFactory(); ~UsersPrivateDelegateFactory() override; |