components/url_formatter/url_formatter.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: components/url_formatter/url_formatter.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 | « components/translate/core/browser/translate_download_manager.cc ('k') | components/variations/net/variations_http_header_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/url_formatter/url_formatter.cc

diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc

index a8031bd2df26138a3c64ce1b602f0411563126cc..ac7c62e14c79f58b837c07d8ded9b66f009cdc97 100644

--- a/components/url_formatter/url_formatter.cc

+++ b/components/url_formatter/url_formatter.cc

@@ -307,7 +307,7 @@ typedef std::map<std::string, icu::UnicodeSet*> LangToExemplarSetMap;

class LangToExemplarSet {

public:

static LangToExemplarSet* GetInstance() {

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

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

}

private:

@@ -317,8 +317,8 @@ class LangToExemplarSet {

STLDeleteContainerPairSecondPointers(map.begin(), map.end());

}

- friend class Singleton<LangToExemplarSet>;

- friend struct DefaultSingletonTraits<LangToExemplarSet>;

+ friend class base::Singleton<LangToExemplarSet>;

+ friend struct base::DefaultSingletonTraits<LangToExemplarSet>;

friend bool GetExemplarSetForLang(const std::string&, icu::UnicodeSet**);

friend void SetExemplarSetForLang(const std::string&, icu::UnicodeSet*);