summaryrefslogtreecommitdiffstats
path: root/content/common/hi_res_timer_manager.h
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-18 07:14:08 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-18 07:14:08 +0000
commit5f988b937aedc6facdd9854ad3fc7fbdf6c9f894 (patch)
treeef48163d1446a13e8981b0dfbbcb906bcf2c867b /content/common/hi_res_timer_manager.h
parent263d2140c09aab094d045eb0736b22236290dd6d (diff)
downloadchromium_src-5f988b937aedc6facdd9854ad3fc7fbdf6c9f894.zip
chromium_src-5f988b937aedc6facdd9854ad3fc7fbdf6c9f894.tar.gz
chromium_src-5f988b937aedc6facdd9854ad3fc7fbdf6c9f894.tar.bz2
Revert 85732 (broke build) - Move SystemMonitor to base/.
I plan to use SystemMonitor in net/. Fix up the Mac implementation not to use Cocoa APIs since @interface is not allowed in base. BUG=none TEST=none Review URL: http://codereview.chromium.org/7015017 TBR=willchan@chromium.org Review URL: http://codereview.chromium.org/7042003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/hi_res_timer_manager.h')
-rw-r--r--content/common/hi_res_timer_manager.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/common/hi_res_timer_manager.h b/content/common/hi_res_timer_manager.h
index 5c3ae38..af522cd 100644
--- a/content/common/hi_res_timer_manager.h
+++ b/content/common/hi_res_timer_manager.h
@@ -6,16 +6,16 @@
#define CONTENT_COMMON_HI_RES_TIMER_MANAGER_H_
#pragma once
-#include "base/system_monitor/system_monitor.h"
+#include "ui/base/system_monitor/system_monitor.h"
// Ensures that the Windows high resolution timer is only used
// when not running on battery power.
-class HighResolutionTimerManager : public base::SystemMonitor::PowerObserver {
+class HighResolutionTimerManager : public ui::SystemMonitor::PowerObserver {
public:
HighResolutionTimerManager();
virtual ~HighResolutionTimerManager();
- // base::SystemMonitor::PowerObserver:
+ // ui::SystemMonitor::PowerObserver:
virtual void OnPowerStateChange(bool on_battery_power);
// Returns true if the hi resolution clock could be used right now.