components/nacl/loader/nacl_main.cc - Issue 179923006: 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: components/nacl/loader/nacl_main.cc

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

Patch Set: Refactored to a more explicitly singleton-like style. Created 6 years, 10 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: components/nacl/loader/nacl_main.cc

diff --git a/components/nacl/loader/nacl_main.cc b/components/nacl/loader/nacl_main.cc

index 15b6fd2dc8cb16e6497876978addc6cca74812b7..de399a9b4ec636eb6b2200b8f063b55739360728 100644

--- a/components/nacl/loader/nacl_main.cc

+++ b/components/nacl/loader/nacl_main.cc

@@ -24,7 +24,7 @@ int NaClMain(const content::MainFunctionParams& parameters) {

scoped_ptr<base::PowerMonitorSource> power_monitor_source(

new base::PowerMonitorDeviceSource());

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

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

base::HighResolutionTimerManager hi_res_timer_manager;

#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)

@@ -49,5 +49,7 @@ int NaClMain(const content::MainFunctionParams& parameters) {

#else

NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc.";

#endif

+ base::PowerMonitor::Shutdown();

return 0;

}