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

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.cc

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

index 7b3d4f141cd9f70030854b6657cf442a655e826e..cb250c1b98c74df96acd4a1b8412da692ec31985 100644

--- a/content/browser/browser_main_loop.cc

+++ b/content/browser/browser_main_loop.cc

@@ -448,8 +448,8 @@

{

TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:PowerMonitor")

scoped_ptr<base::PowerMonitorSource> power_monitor_source(

- new base::PowerMonitorDeviceSource());

- base::PowerMonitor::Initialize(power_monitor_source.Pass());

+ new base::PowerMonitorDeviceSource());

+ power_monitor_.reset(new base::PowerMonitor(power_monitor_source.Pass()));

}

{

TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:HighResTimerManager")