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/guest_view | |
| 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/guest_view')
3 files changed, 3 insertions, 3 deletions
diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc index 075341b..fe90ef7 100644 --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc +++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc @@ -40,7 +40,7 @@ MimeHandlerStreamManagerFactory::MimeHandlerStreamManagerFactory() // static MimeHandlerStreamManagerFactory* MimeHandlerStreamManagerFactory::GetInstance() { - return Singleton<MimeHandlerStreamManagerFactory>::get(); + return base::Singleton<MimeHandlerStreamManagerFactory>::get(); } MimeHandlerStreamManager* MimeHandlerStreamManagerFactory::Get( diff --git a/extensions/browser/guest_view/web_view/web_view_renderer_state.cc b/extensions/browser/guest_view/web_view/web_view_renderer_state.cc index aa0ee09..8e9e26d 100644 --- a/extensions/browser/guest_view/web_view/web_view_renderer_state.cc +++ b/extensions/browser/guest_view/web_view/web_view_renderer_state.cc @@ -17,7 +17,7 @@ WebViewRendererState::WebViewInfo::~WebViewInfo() { // static WebViewRendererState* WebViewRendererState::GetInstance() { - return Singleton<WebViewRendererState>::get(); + return base::Singleton<WebViewRendererState>::get(); } WebViewRendererState::WebViewRendererState() { diff --git a/extensions/browser/guest_view/web_view/web_view_renderer_state.h b/extensions/browser/guest_view/web_view/web_view_renderer_state.h index 24dce02..ad2de37 100644 --- a/extensions/browser/guest_view/web_view/web_view_renderer_state.h +++ b/extensions/browser/guest_view/web_view/web_view_renderer_state.h @@ -72,7 +72,7 @@ class WebViewRendererState { private: friend class WebViewGuest; - friend struct DefaultSingletonTraits<WebViewRendererState>; + friend struct base::DefaultSingletonTraits<WebViewRendererState>; using RenderId = std::pair<int, int>; using WebViewInfoMap = std::map<RenderId, WebViewInfo>; |