diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 21:22:31 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 21:22:31 +0000 |
| commit | 08110ceae09a5e148e67bebd712e7ba1840ccf42 (patch) | |
| tree | 94bdbbc82317bc6f7579d552aace6becd1beaab2 /views/widget/widget_win.cc | |
| parent | a61c5c9bb6524d77c30b6a18f542c0e4616ee7bc (diff) | |
| download | chromium_src-08110ceae09a5e148e67bebd712e7ba1840ccf42.zip chromium_src-08110ceae09a5e148e67bebd712e7ba1840ccf42.tar.gz chromium_src-08110ceae09a5e148e67bebd712e7ba1840ccf42.tar.bz2 | |
Move SystemMonitor to src/ui/base/system_monitor.
Move HiResTimerManager to src/chrome/common.
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6361002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71487 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget/widget_win.cc')
| -rw-r--r-- | views/widget/widget_win.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc index 8fab0ae..587d871 100644 --- a/views/widget/widget_win.cc +++ b/views/widget/widget_win.cc @@ -5,7 +5,6 @@ #include "views/widget/widget_win.h" #include "app/l10n_util_win.h" -#include "app/system_monitor.h" #include "app/view_prop.h" #include "app/win/hwnd_util.h" #include "app/win/win_util.h" @@ -14,6 +13,7 @@ #include "gfx/native_theme_win.h" #include "gfx/path.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" +#include "ui/base/system_monitor/system_monitor.h" #include "views/accessibility/view_accessibility.h" #include "views/controls/native_control_win.h" #include "views/focus/focus_util_win.h" @@ -867,7 +867,7 @@ void WidgetWin::OnPaint(HDC dc) { } LRESULT WidgetWin::OnPowerBroadcast(DWORD power_event, DWORD data) { - SystemMonitor* monitor = SystemMonitor::Get(); + ui::SystemMonitor* monitor = ui::SystemMonitor::Get(); if (monitor) monitor->ProcessWmPowerBroadcastMessage(power_event); SetMsgHandled(FALSE); |