summaryrefslogtreecommitdiffstats
path: root/remoting/base
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 /remoting/base
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 'remoting/base')
-rw-r--r--remoting/base/service_urls.cc2
-rw-r--r--remoting/base/service_urls.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/remoting/base/service_urls.cc b/remoting/base/service_urls.cc
index bd3485c..e235958 100644
--- a/remoting/base/service_urls.cc
+++ b/remoting/base/service_urls.cc
@@ -74,7 +74,7 @@ ServiceUrls::~ServiceUrls() {
}
ServiceUrls* remoting::ServiceUrls::GetInstance() {
- return Singleton<ServiceUrls>::get();
+ return base::Singleton<ServiceUrls>::get();
}
const std::string& ServiceUrls::directory_base_url() const {
diff --git a/remoting/base/service_urls.h b/remoting/base/service_urls.h
index 6d1b625..bafdc6a 100644
--- a/remoting/base/service_urls.h
+++ b/remoting/base/service_urls.h
@@ -37,7 +37,7 @@ class ServiceUrls {
const std::string& gcd_jid() const;
private:
- friend struct DefaultSingletonTraits<ServiceUrls>;
+ friend struct base::DefaultSingletonTraits<ServiceUrls>;
ServiceUrls();
virtual ~ServiceUrls();