content/renderer/render_widget.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/renderer/render_widget.cc

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

Patch Set: git cl format 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

« components/keyed_service/content/browser_context_dependency_manager.h ('K') | « content/renderer/media/webrtc_uma_histograms.cc ('k') | crypto/capi_util.cc » ('j') | ios/chrome/browser/bookmarks/bookmark_model_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_widget.cc

diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc

index a071d1477ad0e8e6c6e6962b95285a313368c79f..8dfb59d62134b83fbe9c2dc08a124e867ea8573b 100644

--- a/content/renderer/render_widget.cc

+++ b/content/renderer/render_widget.cc

@@ -121,7 +121,7 @@ typedef std::map<std::string, ui::TextInputMode> TextInputModeMap;

class TextInputModeMapSingleton {

public:

static TextInputModeMapSingleton* GetInstance() {

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

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

}

TextInputModeMapSingleton() {

map_["verbatim"] = ui::TEXT_INPUT_MODE_VERBATIM;

@@ -140,7 +140,7 @@ class TextInputModeMapSingleton {

private:

TextInputModeMap map_;

- friend struct DefaultSingletonTraits<TextInputModeMapSingleton>;

+ friend struct base::DefaultSingletonTraits<TextInputModeMapSingleton>;

DISALLOW_COPY_AND_ASSIGN(TextInputModeMapSingleton);

};