content/public/browser/desktop_media_id.cc - Issue 1308823002: Move Singleton and related structs to namespace base

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Fix more errors Created 5 years, 4 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

« base/trace_event/trace_log.cc ('K') | « content/common/sandbox_linux/sandbox_linux.cc ('k') | content/renderer/media/webrtc_uma_histograms.h » ('j') | ios/chrome/browser/favicon/favicon_service_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 74fbb3ab89f9310a227472c28eae347f2762b420..4ca97f46430b6f71bff9e29d3bfb220e2395c1e3 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 {}