summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/sessions')
-rw-r--r--chrome/browser/sessions/session_service_factory.cc2
-rw-r--r--chrome/browser/sessions/session_service_factory.h2
-rw-r--r--chrome/browser/sessions/tab_restore_service_factory.cc2
-rw-r--r--chrome/browser/sessions/tab_restore_service_factory.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/sessions/session_service_factory.cc b/chrome/browser/sessions/session_service_factory.cc
index 99a7e8b..8ce4165 100644
--- a/chrome/browser/sessions/session_service_factory.cc
+++ b/chrome/browser/sessions/session_service_factory.cc
@@ -63,7 +63,7 @@ void SessionServiceFactory::ShutdownForProfile(Profile* profile) {
}
SessionServiceFactory* SessionServiceFactory::GetInstance() {
- return Singleton<SessionServiceFactory>::get();
+ return base::Singleton<SessionServiceFactory>::get();
}
SessionServiceFactory::SessionServiceFactory()
diff --git a/chrome/browser/sessions/session_service_factory.h b/chrome/browser/sessions/session_service_factory.h
index c0db39c..a7735ca 100644
--- a/chrome/browser/sessions/session_service_factory.h
+++ b/chrome/browser/sessions/session_service_factory.h
@@ -55,7 +55,7 @@ class SessionServiceFactory : public BrowserContextKeyedServiceFactory {
static SessionServiceFactory* GetInstance();
private:
- friend struct DefaultSingletonTraits<SessionServiceFactory>;
+ friend struct base::DefaultSingletonTraits<SessionServiceFactory>;
FRIEND_TEST_ALL_PREFIXES(SessionCrashedInfoBarDelegateUnitTest,
DetachingTabWithCrashedInfoBar);
diff --git a/chrome/browser/sessions/tab_restore_service_factory.cc b/chrome/browser/sessions/tab_restore_service_factory.cc
index a0d5db4..6d0b85e 100644
--- a/chrome/browser/sessions/tab_restore_service_factory.cc
+++ b/chrome/browser/sessions/tab_restore_service_factory.cc
@@ -35,7 +35,7 @@ void TabRestoreServiceFactory::ResetForProfile(Profile* profile) {
}
TabRestoreServiceFactory* TabRestoreServiceFactory::GetInstance() {
- return Singleton<TabRestoreServiceFactory>::get();
+ return base::Singleton<TabRestoreServiceFactory>::get();
}
TabRestoreServiceFactory::TabRestoreServiceFactory()
diff --git a/chrome/browser/sessions/tab_restore_service_factory.h b/chrome/browser/sessions/tab_restore_service_factory.h
index 874f54d..a069d71 100644
--- a/chrome/browser/sessions/tab_restore_service_factory.h
+++ b/chrome/browser/sessions/tab_restore_service_factory.h
@@ -27,7 +27,7 @@ class TabRestoreServiceFactory : public BrowserContextKeyedServiceFactory {
static TabRestoreServiceFactory* GetInstance();
private:
- friend struct DefaultSingletonTraits<TabRestoreServiceFactory>;
+ friend struct base::DefaultSingletonTraits<TabRestoreServiceFactory>;
TabRestoreServiceFactory();
~TabRestoreServiceFactory() override;