content/app/content_main_runner.cc - Issue 17074009: Created multi-process-friendly PowerMonitor interface.

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/app/content_main_runner.cc

Issue 17074009: Created multi-process-friendly PowerMonitor interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixing windows unit test errors Created 7 years, 5 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/app/content_main_runner.cc

diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc

index a91d6d3df7f4fb0b0c5b20b11345b146c9eb5837..dfab14ffe9e726c168529934e2526c73f00c71b5 100644

--- a/content/app/content_main_runner.cc

+++ b/content/app/content_main_runner.cc

@@ -68,7 +68,7 @@

#elif defined(OS_MACOSX)

#include "base/mac/scoped_nsautorelease_pool.h"

#if !defined(OS_IOS)

-#include "base/power_monitor/power_monitor.h"

+#include "base/power_monitor/power_monitor_device_source.h"

#include "content/browser/mach_broker_mac.h"

#include "content/common/sandbox_init_mac.h"

#endif // !OS_IOS

@@ -665,7 +665,7 @@ class ContentMainRunnerImpl : public ContentMainRunner {

process_type == switches::kWorkerProcess ||

(delegate &&

delegate->ProcessRegistersWithSystemProcess(process_type))) {

- base::PowerMonitor::AllocateSystemIOPorts();

+ base::PowerMonitorDeviceSource::AllocateSystemIOPorts();

}

if (!process_type.empty() &&