summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/notifications/notifications_api.cc
diff options
context:
space:
mode:
authorolli.raula <olli.raula@intel.com>2015-09-10 04:14:22 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-10 11:15:10 +0000
commit36aa8be4eb53b3ea75b84a9646e0204725f3bc43 (patch)
tree74da8174db2a6edd8d55cf141ec1976b3b37365d /chrome/browser/extensions/api/notifications/notifications_api.cc
parent68fc3715f76e3da9131b035ddd9606dfee6180bd (diff)
downloadchromium_src-36aa8be4eb53b3ea75b84a9646e0204725f3bc43.zip
chromium_src-36aa8be4eb53b3ea75b84a9646e0204725f3bc43.tar.gz
chromium_src-36aa8be4eb53b3ea75b84a9646e0204725f3bc43.tar.bz2
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<T> 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}
Diffstat (limited to 'chrome/browser/extensions/api/notifications/notifications_api.cc')
-rw-r--r--chrome/browser/extensions/api/notifications/notifications_api.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/api/notifications/notifications_api.cc b/chrome/browser/extensions/api/notifications/notifications_api.cc
index 788c41e..ba47fa4 100644
--- a/chrome/browser/extensions/api/notifications/notifications_api.cc
+++ b/chrome/browser/extensions/api/notifications/notifications_api.cc
@@ -106,11 +106,11 @@ class ShutdownNotifierFactory
: public BrowserContextKeyedServiceShutdownNotifierFactory {
public:
static ShutdownNotifierFactory* GetInstance() {
- return Singleton<ShutdownNotifierFactory>::get();
+ return base::Singleton<ShutdownNotifierFactory>::get();
}
private:
- friend struct DefaultSingletonTraits<ShutdownNotifierFactory>;
+ friend struct base::DefaultSingletonTraits<ShutdownNotifierFactory>;
ShutdownNotifierFactory()
: BrowserContextKeyedServiceShutdownNotifierFactory(