diff options
| author | olli.raula <olli.raula@intel.com> | 2015-09-10 04:14:22 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-10 11:15:10 +0000 |
| commit | 36aa8be4eb53b3ea75b84a9646e0204725f3bc43 (patch) | |
| tree | 74da8174db2a6edd8d55cf141ec1976b3b37365d /extensions/browser/app_window | |
| parent | 68fc3715f76e3da9131b035ddd9606dfee6180bd (diff) | |
| download | chromium_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 'extensions/browser/app_window')
4 files changed, 4 insertions, 4 deletions
diff --git a/extensions/browser/app_window/app_window_geometry_cache.cc b/extensions/browser/app_window/app_window_geometry_cache.cc index 3c3ec53..4b3bb48 100644 --- a/extensions/browser/app_window/app_window_geometry_cache.cc +++ b/extensions/browser/app_window/app_window_geometry_cache.cc @@ -267,7 +267,7 @@ AppWindowGeometryCache* AppWindowGeometryCache::Factory::GetForContext( AppWindowGeometryCache::Factory* AppWindowGeometryCache::Factory::GetInstance() { - return Singleton<AppWindowGeometryCache::Factory>::get(); + return base::Singleton<AppWindowGeometryCache::Factory>::get(); } AppWindowGeometryCache::Factory::Factory() diff --git a/extensions/browser/app_window/app_window_geometry_cache.h b/extensions/browser/app_window/app_window_geometry_cache.h index 314db45..08aeeb8 100644 --- a/extensions/browser/app_window/app_window_geometry_cache.h +++ b/extensions/browser/app_window/app_window_geometry_cache.h @@ -42,7 +42,7 @@ class AppWindowGeometryCache : public KeyedService, static Factory* GetInstance(); private: - friend struct DefaultSingletonTraits<Factory>; + friend struct base::DefaultSingletonTraits<Factory>; Factory(); ~Factory() override; diff --git a/extensions/browser/app_window/app_window_registry.cc b/extensions/browser/app_window/app_window_registry.cc index e5c9497..6fc0ded 100644 --- a/extensions/browser/app_window/app_window_registry.cc +++ b/extensions/browser/app_window/app_window_registry.cc @@ -239,7 +239,7 @@ AppWindowRegistry* AppWindowRegistry::Factory::GetForBrowserContext( } AppWindowRegistry::Factory* AppWindowRegistry::Factory::GetInstance() { - return Singleton<AppWindowRegistry::Factory>::get(); + return base::Singleton<AppWindowRegistry::Factory>::get(); } AppWindowRegistry::Factory::Factory() diff --git a/extensions/browser/app_window/app_window_registry.h b/extensions/browser/app_window/app_window_registry.h index 6d5ba85..d273fbb 100644 --- a/extensions/browser/app_window/app_window_registry.h +++ b/extensions/browser/app_window/app_window_registry.h @@ -111,7 +111,7 @@ class AppWindowRegistry : public KeyedService { static Factory* GetInstance(); private: - friend struct DefaultSingletonTraits<Factory>; + friend struct base::DefaultSingletonTraits<Factory>; Factory(); ~Factory() override; |