chrome/browser/extensions/api/preference/preference_api.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/extensions/api/preference/preference_api.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add blank lines 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/memory/singleton.h ('K') | « chrome/browser/extensions/api/passwords_private/passwords_private_event_router_factory.cc ('k') | chrome/browser/extensions/api/proxy/proxy_api.h » ('j') | chromecast/media/base/media_message_loop.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/preference/preference_api.cc

diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc

index ac80eb49dc6e367e9c629ccf8f2cc342deb12a10..44f9b122665c7d7387b360b9dbe0fbd369110407 100644

--- a/chrome/browser/extensions/api/preference/preference_api.cc

+++ b/chrome/browser/extensions/api/preference/preference_api.cc

@@ -211,7 +211,7 @@ class NetworkPredictionTransformer : public PrefTransformerInterface {

class PrefMapping {

public:

static PrefMapping* GetInstance() {

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

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

}

bool FindBrowserPrefForExtensionPref(const std::string& extension_pref,

@@ -251,7 +251,7 @@ class PrefMapping {

}

private:

- friend struct DefaultSingletonTraits<PrefMapping>;

+ friend struct base::DefaultSingletonTraits<PrefMapping>;

PrefMapping() {

identity_transformer_.reset(new IdentityPrefTransformer());