ui/base/x/x11_util.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: ui/base/x/x11_util.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

Index: ui/base/x/x11_util.cc

diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc

index ad3bb363b293bc053a633467031b9bc453be4e75..f7b29fdf6a7fbacf4204702e1e60c1201617b6e9 100644

--- a/ui/base/x/x11_util.cc

+++ b/ui/base/x/x11_util.cc

@@ -211,7 +211,7 @@ XCursorCache* cursor_cache = NULL;

class XCustomCursorCache {

public:

static XCustomCursorCache* GetInstance() {

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

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

}

::Cursor InstallCustomCursor(XcursorImage* image) {

@@ -239,7 +239,7 @@ class XCustomCursorCache {

}

private:

- friend struct DefaultSingletonTraits<XCustomCursorCache>;

+ friend struct base::DefaultSingletonTraits<XCustomCursorCache>;

class XCustomCursor {

public:

« no previous file with comments | « ui/base/x/x11_menu_list.cc ('k') | ui/chromeos/ime/input_method_menu_manager.h » ('j') | no next file with comments »