diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 07:04:06 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 07:04:06 +0000 |
commit | 69803a4f13f3eb26b982e82493672367e984907a (patch) | |
tree | 7129dda29bb0b45ae287e3d0b8d6c34e83ae98cc /views | |
parent | c7e136fc8a564f1a30ef6214e4f2b5d598cfbe94 (diff) | |
download | chromium_src-69803a4f13f3eb26b982e82493672367e984907a.zip chromium_src-69803a4f13f3eb26b982e82493672367e984907a.tar.gz chromium_src-69803a4f13f3eb26b982e82493672367e984907a.tar.bz2 |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85732 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-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 460fa5d..65e2e77 100644 --- a/views/widget/widget_win.cc +++ b/views/widget/widget_win.cc @@ -7,6 +7,7 @@ #include <dwmapi.h> #include "base/string_util.h" +#include "base/system_monitor/system_monitor.h" #include "base/win/windows_version.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/drag_source.h" @@ -14,7 +15,6 @@ #include "ui/base/dragdrop/os_exchange_data_provider_win.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" #include "ui/base/l10n/l10n_util_win.h" -#include "ui/base/system_monitor/system_monitor.h" #include "ui/base/theme_provider.h" #include "ui/base/view_prop.h" #include "ui/base/win/hwnd_util.h" @@ -859,7 +859,7 @@ void WidgetWin::OnPaint(HDC dc) { } LRESULT WidgetWin::OnPowerBroadcast(DWORD power_event, DWORD data) { - ui::SystemMonitor* monitor = ui::SystemMonitor::Get(); + base::SystemMonitor* monitor = base::SystemMonitor::Get(); if (monitor) monitor->ProcessWmPowerBroadcastMessage(power_event); SetMsgHandled(FALSE); |