summaryrefslogtreecommitdiffstats
path: root/content/utility
diff options
context:
space:
mode:
authorbajones@chromium.org <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-02 22:09:13 +0000
committerbajones@chromium.org <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-02 22:09:13 +0000
commit9dd901522edbaf51a00f03504cac30553b5dbfde (patch)
tree5e812fac198a30a83f80490814b691ba4b869573 /content/utility
parent1d1b537362626b73838ebbe55d4aed3f8116e7d9 (diff)
downloadchromium_src-9dd901522edbaf51a00f03504cac30553b5dbfde.zip
chromium_src-9dd901522edbaf51a00f03504cac30553b5dbfde.tar.gz
chromium_src-9dd901522edbaf51a00f03504cac30553b5dbfde.tar.bz2
Created multi-process-friendly PowerMonitor interface.
PowerMonitor status is now captured in the browser process, which has the appropriate UI thread, and then sent via IPC to other processes which are interested in the power state. BUG=236031 R=apatrick@chromium.org, jam@chromium.org, jar@chromium.org, jvoung@chromium.org, kbr@chromium.org, mpcomplete@chromium.org, palmer@chromium.org, piman@chromium.org, vandebo@chromium.org Review URL: https://codereview.chromium.org/17074009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215381 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/utility')
-rw-r--r--content/utility/utility_main.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/content/utility/utility_main.cc b/content/utility/utility_main.cc
index 3d130f9..c93c1ec 100644
--- a/content/utility/utility_main.cc
+++ b/content/utility/utility_main.cc
@@ -4,7 +4,6 @@
#include "base/command_line.h"
#include "base/message_loop/message_loop.h"
-#include "base/power_monitor/power_monitor.h"
#include "base/threading/platform_thread.h"
#include "base/timer/hi_res_timer_manager.h"
#include "content/child/child_process.h"
@@ -26,9 +25,6 @@ int UtilityMain(const MainFunctionParams& parameters) {
base::MessageLoop main_message_loop;
base::PlatformThread::SetName("CrUtilityMain");
- base::PowerMonitor power_monitor;
- base::HighResolutionTimerManager hi_res_timer_manager;
-
#if defined(OS_LINUX)
// Initialize the sandbox before any thread is created.
LinuxSandbox::InitializeSandbox();
@@ -37,6 +33,8 @@ int UtilityMain(const MainFunctionParams& parameters) {
ChildProcess utility_process;
utility_process.set_main_thread(new UtilityThreadImpl());
+ base::HighResolutionTimerManager hi_res_timer_manager;
+
#if defined(OS_WIN)
bool no_sandbox = parameters.command_line.HasSwitch(switches::kNoSandbox);
if (!no_sandbox) {