content/browser/browser_main_loop.h - Issue 226263008: Revert of Attempting to resolve a race condition with PowerMonitor

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/browser/browser_main_loop.h

Issue 226263008: Revert of Attempting to resolve a race condition with PowerMonitor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 8 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: content/browser/browser_main_loop.h

diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h

index a305a02639ee8b8e6287a0024055ba6ff3f8dd08..8f8af82db2c3beb2bbc36a014c308702db4eae8b 100644

--- a/content/browser/browser_main_loop.h

+++ b/content/browser/browser_main_loop.h

@@ -16,6 +16,7 @@

class FilePath;

class HighResolutionTimerManager;

class MessageLoop;

+class PowerMonitor;

class SystemMonitor;

namespace debug {

class TraceMemoryController;

@@ -138,6 +139,7 @@

// Members initialized in |MainMessageLoopStart()| ---------------------------

scoped_ptr<base::MessageLoop> main_message_loop_;

scoped_ptr<base::SystemMonitor> system_monitor_;

+ scoped_ptr<base::PowerMonitor> power_monitor_;

scoped_ptr<base::HighResolutionTimerManager> hi_res_timer_manager_;

scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;

// user_input_monitor_ has to outlive audio_manager_, so declared first.

« no previous file with comments | « components/nacl/loader/nacl_main.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »