mojo/message_pump/handle_watcher.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: mojo/message_pump/handle_watcher.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: mojo/message_pump/handle_watcher.cc

diff --git a/mojo/message_pump/handle_watcher.cc b/mojo/message_pump/handle_watcher.cc

index d02c761109692b257b18d94332c814b9974a87c3..964f1e2d3348d80b1edef376538ce2eac0862639 100644

--- a/mojo/message_pump/handle_watcher.cc

+++ b/mojo/message_pump/handle_watcher.cc

@@ -190,7 +190,7 @@ class WatcherThreadManager {

typedef std::vector<RequestData> Requests;

- friend struct DefaultSingletonTraits<WatcherThreadManager>;

+ friend struct base::DefaultSingletonTraits<WatcherThreadManager>;

WatcherThreadManager();

@@ -222,7 +222,7 @@ WatcherThreadManager::~WatcherThreadManager() {

}

WatcherThreadManager* WatcherThreadManager::GetInstance() {

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

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

}

WatcherID WatcherThreadManager::StartWatching(

« no previous file with comments | « ipc/ipc_logging.cc ('k') | net/base/openssl_private_key_store_memory.cc » ('j') | no next file with comments »