Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(485)

Unified Diff: content/public/browser/desktop_media_id.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ToT Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/sandbox_linux/sandbox_linux.cc ('k') | content/renderer/media/webrtc_uma_histograms.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/browser/desktop_media_id.cc
diff --git a/content/public/browser/desktop_media_id.cc b/content/public/browser/desktop_media_id.cc
index 2d7f6d1bae85d0d646e0b69488d06751a5732464..1ec49b7b4de8594b3788e8b3a250ad3bf9164f6c 100644
--- a/content/public/browser/desktop_media_id.cc
+++ b/content/public/browser/desktop_media_id.cc
@@ -24,7 +24,7 @@ namespace {
class AuraWindowRegistry : public aura::WindowObserver {
public:
static AuraWindowRegistry* GetInstance() {
- return Singleton<AuraWindowRegistry>::get();
+ return base::Singleton<AuraWindowRegistry>::get();
}
int RegisterWindow(aura::Window* window) {
@@ -43,7 +43,7 @@ class AuraWindowRegistry : public aura::WindowObserver {
}
private:
- friend struct DefaultSingletonTraits<AuraWindowRegistry>;
+ friend struct base::DefaultSingletonTraits<AuraWindowRegistry>;
AuraWindowRegistry() {}
~AuraWindowRegistry() override {}
« no previous file with comments | « content/common/sandbox_linux/sandbox_linux.cc ('k') | content/renderer/media/webrtc_uma_histograms.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698