summaryrefslogtreecommitdiffstats
path: root/chrome/browser/push_messaging
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/push_messaging')
-rw-r--r--chrome/browser/push_messaging/push_messaging_permission_context_factory.cc2
-rw-r--r--chrome/browser/push_messaging/push_messaging_permission_context_factory.h3
-rw-r--r--chrome/browser/push_messaging/push_messaging_service_factory.cc2
-rw-r--r--chrome/browser/push_messaging/push_messaging_service_factory.h2
4 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/push_messaging/push_messaging_permission_context_factory.cc b/chrome/browser/push_messaging/push_messaging_permission_context_factory.cc
index ad2855a..3bb8ad9 100644
--- a/chrome/browser/push_messaging/push_messaging_permission_context_factory.cc
+++ b/chrome/browser/push_messaging/push_messaging_permission_context_factory.cc
@@ -20,7 +20,7 @@ PushMessagingPermissionContextFactory::GetForProfile(
// static
PushMessagingPermissionContextFactory*
PushMessagingPermissionContextFactory::GetInstance() {
- return Singleton<PushMessagingPermissionContextFactory>::get();
+ return base::Singleton<PushMessagingPermissionContextFactory>::get();
}
PushMessagingPermissionContextFactory::PushMessagingPermissionContextFactory()
diff --git a/chrome/browser/push_messaging/push_messaging_permission_context_factory.h b/chrome/browser/push_messaging/push_messaging_permission_context_factory.h
index 84e4bc1..966b981 100644
--- a/chrome/browser/push_messaging/push_messaging_permission_context_factory.h
+++ b/chrome/browser/push_messaging/push_messaging_permission_context_factory.h
@@ -19,7 +19,8 @@ class PushMessagingPermissionContextFactory
static PushMessagingPermissionContextFactory* GetInstance();
private:
- friend struct DefaultSingletonTraits<PushMessagingPermissionContextFactory>;
+ friend struct base::DefaultSingletonTraits<
+ PushMessagingPermissionContextFactory>;
PushMessagingPermissionContextFactory();
~PushMessagingPermissionContextFactory() override;
diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.cc b/chrome/browser/push_messaging/push_messaging_service_factory.cc
index d8b36caa..2287fb0 100644
--- a/chrome/browser/push_messaging/push_messaging_service_factory.cc
+++ b/chrome/browser/push_messaging/push_messaging_service_factory.cc
@@ -26,7 +26,7 @@ PushMessagingServiceImpl* PushMessagingServiceFactory::GetForProfile(
// static
PushMessagingServiceFactory* PushMessagingServiceFactory::GetInstance() {
- return Singleton<PushMessagingServiceFactory>::get();
+ return base::Singleton<PushMessagingServiceFactory>::get();
}
PushMessagingServiceFactory::PushMessagingServiceFactory()
diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.h b/chrome/browser/push_messaging/push_messaging_service_factory.h
index b15b11d..e5c8622 100644
--- a/chrome/browser/push_messaging/push_messaging_service_factory.h
+++ b/chrome/browser/push_messaging/push_messaging_service_factory.h
@@ -18,7 +18,7 @@ class PushMessagingServiceFactory : public BrowserContextKeyedServiceFactory {
static PushMessagingServiceFactory* GetInstance();
private:
- friend struct DefaultSingletonTraits<PushMessagingServiceFactory>;
+ friend struct base::DefaultSingletonTraits<PushMessagingServiceFactory>;
PushMessagingServiceFactory();
~PushMessagingServiceFactory() override;