From 36aa8be4eb53b3ea75b84a9646e0204725f3bc43 Mon Sep 17 00:00:00 2001 From: "olli.raula" Date: Thu, 10 Sep 2015 04:14:22 -0700 Subject: Move Singleton and related structs to namespace base Public APIs from base should live inside base:: so moved Singleton class and structs to base{} and fixed consumers. also fixed: ** Presubmit ERRORS ** Found Singleton in the following header files. Please move them to an appropriate source file so that the template gets instantiated in a single compilation unit. chrome/browser/plugins/plugin_finder.h \ chromecast/media/base/media_message_loop.h \ content/browser/media/android/media_drm_credential_manager.h Presubmit warnings: src/chrome/browser/extensions/warning_badge_service_factory.h:5: #ifndef header guard has wrong style, please use: CHROME_BROWSER_EXTENSIONS_WARNING_BADGE_SERVICE_FACTORY_H_ [build/header_guard] [5] src/chrome/browser/extensions/warning_badge_service_factory.h:39: #endif line should be "#endif // CHROME_BROWSER_EXTENSIONS_WARNING_BADGE_SERVICE_FACTORY_H_" [build/header_guard] [5] TBR=jam@chromium.org Review URL: https://codereview.chromium.org/1308823002 Cr-Commit-Position: refs/heads/master@{#348136} --- apps/app_load_service_factory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps/app_load_service_factory.h') diff --git a/apps/app_load_service_factory.h b/apps/app_load_service_factory.h index 68fa7db..3c67b70 100644 --- a/apps/app_load_service_factory.h +++ b/apps/app_load_service_factory.h @@ -21,7 +21,7 @@ class AppLoadServiceFactory : public BrowserContextKeyedServiceFactory { static AppLoadServiceFactory* GetInstance(); private: - friend struct DefaultSingletonTraits; + friend struct base::DefaultSingletonTraits; AppLoadServiceFactory(); ~AppLoadServiceFactory() override; -- cgit v1.1