diff options
Diffstat (limited to 'chrome/browser/bookmarks')
8 files changed, 15 insertions, 8 deletions
diff --git a/chrome/browser/bookmarks/bookmark_model_factory.cc b/chrome/browser/bookmarks/bookmark_model_factory.cc index ef36f5c..b4be798 100644 --- a/chrome/browser/bookmarks/bookmark_model_factory.cc +++ b/chrome/browser/bookmarks/bookmark_model_factory.cc @@ -46,7 +46,7 @@ BookmarkModel* BookmarkModelFactory::GetForProfileIfExists(Profile* profile) { // static BookmarkModelFactory* BookmarkModelFactory::GetInstance() { - return Singleton<BookmarkModelFactory>::get(); + return base::Singleton<BookmarkModelFactory>::get(); } BookmarkModelFactory::BookmarkModelFactory() diff --git a/chrome/browser/bookmarks/bookmark_model_factory.h b/chrome/browser/bookmarks/bookmark_model_factory.h index 57700f0..b4a67bf 100644 --- a/chrome/browser/bookmarks/bookmark_model_factory.h +++ b/chrome/browser/bookmarks/bookmark_model_factory.h @@ -8,7 +8,9 @@ #include "base/macros.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} class Profile; @@ -26,7 +28,7 @@ class BookmarkModelFactory : public BrowserContextKeyedServiceFactory { static BookmarkModelFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<BookmarkModelFactory>; + friend struct base::DefaultSingletonTraits<BookmarkModelFactory>; BookmarkModelFactory(); ~BookmarkModelFactory() override; diff --git a/chrome/browser/bookmarks/chrome_bookmark_client_factory.cc b/chrome/browser/bookmarks/chrome_bookmark_client_factory.cc index 2626f78..c84a374 100644 --- a/chrome/browser/bookmarks/chrome_bookmark_client_factory.cc +++ b/chrome/browser/bookmarks/chrome_bookmark_client_factory.cc @@ -32,7 +32,7 @@ ChromeBookmarkClient* ChromeBookmarkClientFactory::GetForProfile( // static ChromeBookmarkClientFactory* ChromeBookmarkClientFactory::GetInstance() { - return Singleton<ChromeBookmarkClientFactory>::get(); + return base::Singleton<ChromeBookmarkClientFactory>::get(); } // static diff --git a/chrome/browser/bookmarks/chrome_bookmark_client_factory.h b/chrome/browser/bookmarks/chrome_bookmark_client_factory.h index a5971f6..6976098 100644 --- a/chrome/browser/bookmarks/chrome_bookmark_client_factory.h +++ b/chrome/browser/bookmarks/chrome_bookmark_client_factory.h @@ -8,8 +8,10 @@ #include "base/macros.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} // namespace base class ChromeBookmarkClient; class Profile; @@ -23,7 +25,7 @@ class ChromeBookmarkClientFactory : public BrowserContextKeyedServiceFactory { static TestingFactoryFunction GetDefaultFactory(); private: - friend struct DefaultSingletonTraits<ChromeBookmarkClientFactory>; + friend struct base::DefaultSingletonTraits<ChromeBookmarkClientFactory>; ChromeBookmarkClientFactory(); ~ChromeBookmarkClientFactory() override; diff --git a/chrome/browser/bookmarks/managed_bookmark_service_factory.cc b/chrome/browser/bookmarks/managed_bookmark_service_factory.cc index ffeafb3..64fed09 100644 --- a/chrome/browser/bookmarks/managed_bookmark_service_factory.cc +++ b/chrome/browser/bookmarks/managed_bookmark_service_factory.cc @@ -45,7 +45,7 @@ bookmarks::ManagedBookmarkService* ManagedBookmarkServiceFactory::GetForProfile( // static ManagedBookmarkServiceFactory* ManagedBookmarkServiceFactory::GetInstance() { - return Singleton<ManagedBookmarkServiceFactory>::get(); + return base::Singleton<ManagedBookmarkServiceFactory>::get(); } // static diff --git a/chrome/browser/bookmarks/managed_bookmark_service_factory.h b/chrome/browser/bookmarks/managed_bookmark_service_factory.h index af1e102..3ce2f65 100644 --- a/chrome/browser/bookmarks/managed_bookmark_service_factory.h +++ b/chrome/browser/bookmarks/managed_bookmark_service_factory.h @@ -9,8 +9,11 @@ #include "base/memory/scoped_ptr.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" +namespace base { template <typename T> struct DefaultSingletonTraits; +} // namespace base + class Profile; namespace bookmarks { @@ -26,7 +29,7 @@ class ManagedBookmarkServiceFactory : public BrowserContextKeyedServiceFactory { static TestingFactoryFunction GetDefaultFactory(); private: - friend struct DefaultSingletonTraits<ManagedBookmarkServiceFactory>; + friend struct base::DefaultSingletonTraits<ManagedBookmarkServiceFactory>; ManagedBookmarkServiceFactory(); ~ManagedBookmarkServiceFactory() override; diff --git a/chrome/browser/bookmarks/startup_task_runner_service_factory.cc b/chrome/browser/bookmarks/startup_task_runner_service_factory.cc index d252e61..875b4e4 100644 --- a/chrome/browser/bookmarks/startup_task_runner_service_factory.cc +++ b/chrome/browser/bookmarks/startup_task_runner_service_factory.cc @@ -28,7 +28,7 @@ StartupTaskRunnerService* StartupTaskRunnerServiceFactory::GetForProfile( // static StartupTaskRunnerServiceFactory* StartupTaskRunnerServiceFactory::GetInstance() { - return Singleton<StartupTaskRunnerServiceFactory>::get(); + return base::Singleton<StartupTaskRunnerServiceFactory>::get(); } KeyedService* StartupTaskRunnerServiceFactory::BuildServiceInstanceFor( diff --git a/chrome/browser/bookmarks/startup_task_runner_service_factory.h b/chrome/browser/bookmarks/startup_task_runner_service_factory.h index 75a4738..9450e41 100644 --- a/chrome/browser/bookmarks/startup_task_runner_service_factory.h +++ b/chrome/browser/bookmarks/startup_task_runner_service_factory.h @@ -28,7 +28,7 @@ class StartupTaskRunnerServiceFactory static StartupTaskRunnerServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits<StartupTaskRunnerServiceFactory>; + friend struct base::DefaultSingletonTraits<StartupTaskRunnerServiceFactory>; StartupTaskRunnerServiceFactory(); ~StartupTaskRunnerServiceFactory() override; |