summaryrefslogtreecommitdiffstats
path: root/content/plugin
diff options
context:
space:
mode:
authorhongbo.min@intel.com <hongbo.min@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-03 19:06:51 +0000
committerhongbo.min@intel.com <hongbo.min@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-03 19:06:51 +0000
commit6c5905b763d18bf2d81e2d1f4aac7f16ae32f6ea (patch)
tree86297e816ccbbe8dd10ab6fec01b350be86f63ea /content/plugin
parent617b65edba554089efd872e9f59f01ae964690ab (diff)
downloadchromium_src-6c5905b763d18bf2d81e2d1f4aac7f16ae32f6ea.zip
chromium_src-6c5905b763d18bf2d81e2d1f4aac7f16ae32f6ea.tar.gz
chromium_src-6c5905b763d18bf2d81e2d1f4aac7f16ae32f6ea.tar.bz2
Split the power monitoring feature from SystemMonitor
The SystemMonitor is a mixed monitor which not only monitors the power state changes but also the devices changes. This patch is to separate the power monitor from SystemMonitor as a new class PowerMonitor which is dedicated to monitor power state. The next step is to seek a opportunity to refactor SystemMonitor as something like DeviceMonitor. BUG=149059 TEST=base_unittests --gtest_filter=PowerMonitorTest.* Review URL: https://chromiumcodereview.appspot.com/10959020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192114 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin')
-rw-r--r--content/plugin/plugin_main.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc
index 971e308..2f0817e 100644
--- a/content/plugin/plugin_main.cc
+++ b/content/plugin/plugin_main.cc
@@ -13,7 +13,7 @@
#include "base/hi_res_timer_manager.h"
#include "base/message_loop.h"
#include "base/string_util.h"
-#include "base/system_monitor/system_monitor.h"
+#include "base/power_monitor/power_monitor.h"
#include "base/threading/platform_thread.h"
#include "content/common/child_process.h"
#include "content/plugin/plugin_thread.h"
@@ -55,7 +55,7 @@ int PluginMain(const MainFunctionParams& parameters) {
MessageLoop main_message_loop(MessageLoop::TYPE_UI);
base::PlatformThread::SetName("CrPluginMain");
- base::SystemMonitor system_monitor;
+ base::PowerMonitor power_monitor;
HighResolutionTimerManager high_resolution_timer_manager;
const CommandLine& parsed_command_line = parameters.command_line;