chrome/browser/ui/prefs/prefs_tab_helper.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: chrome/browser/ui/prefs/prefs_tab_helper.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') | « chrome/browser/ui/libgtk2ui/gtk2_event_loop.cc ('k') | chrome/browser/ui/search/new_tab_page_interceptor_service_factory.h » ('j') | ios/chrome/browser/favicon/favicon_service_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/prefs/prefs_tab_helper.cc

diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc

index e57c8a9e1c802414366c56f857b1ce0a8133e0e4..9b410e83319f8a8780c0c3a5e382f24d4a50142b 100644

--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc

+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc

@@ -427,11 +427,11 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {

}

static PrefWatcherFactory* GetInstance() {

- return Singleton<PrefWatcherFactory>::get();

+ return base::Singleton<PrefWatcherFactory>::get();

}

private:

- friend struct DefaultSingletonTraits<PrefWatcherFactory>;

+ friend struct base::DefaultSingletonTraits<PrefWatcherFactory>;

PrefWatcherFactory() : BrowserContextKeyedServiceFactory(

"PrefWatcher",