mojo/message_pump/handle_watcher.cc - Issue 2061433002: Roll base to 9e74307b276b2f9988005c0e97e85ee222586f79.

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 2061433002: Roll base to 9e74307b276b2f9988005c0e97e85ee222586f79. (Closed) Base URL: https://github.com/domokit/monet.git@master

Patch Set: Created 4 years, 6 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:

Index: mojo/message_pump/handle_watcher.cc

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

index c330d31b1c5295958ea20527de520dc28c9efa34..623fc2b6d40ef320f07a11a7df5300bf3abaddfe 100644

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

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

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

typedef std::vector<RequestData> Requests;

- friend struct DefaultSingletonTraits<WatcherThreadManager>;

+ friend struct base::DefaultSingletonTraits<WatcherThreadManager>;

WatcherThreadManager();

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

}

WatcherThreadManager* WatcherThreadManager::GetInstance() {

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

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

}

WatcherID WatcherThreadManager::StartWatching(

« no previous file with comments | « crypto/openssl_util.cc ('k') | net/cert/cert_database.h » ('j') | no next file with comments »