Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Side by Side Diff: views/widget/widget_win.cc

Issue 7042003: Revert 85732 (broke build) - Move SystemMonitor to base/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/views/widget/native_widget_win.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "views/widget/widget_win.h" 5 #include "views/widget/widget_win.h"
6 6
7 #include <dwmapi.h> 7 #include <dwmapi.h>
8 8
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/system_monitor/system_monitor.h"
11 #include "base/win/windows_version.h" 10 #include "base/win/windows_version.h"
12 #include "ui/base/dragdrop/drag_drop_types.h" 11 #include "ui/base/dragdrop/drag_drop_types.h"
13 #include "ui/base/dragdrop/drag_source.h" 12 #include "ui/base/dragdrop/drag_source.h"
14 #include "ui/base/dragdrop/os_exchange_data.h" 13 #include "ui/base/dragdrop/os_exchange_data.h"
15 #include "ui/base/dragdrop/os_exchange_data_provider_win.h" 14 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
16 #include "ui/base/keycodes/keyboard_code_conversion_win.h" 15 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
17 #include "ui/base/l10n/l10n_util_win.h" 16 #include "ui/base/l10n/l10n_util_win.h"
17 #include "ui/base/system_monitor/system_monitor.h"
18 #include "ui/base/theme_provider.h" 18 #include "ui/base/theme_provider.h"
19 #include "ui/base/view_prop.h" 19 #include "ui/base/view_prop.h"
20 #include "ui/base/win/hwnd_util.h" 20 #include "ui/base/win/hwnd_util.h"
21 #include "ui/gfx/canvas_skia.h" 21 #include "ui/gfx/canvas_skia.h"
22 #include "ui/gfx/native_theme_win.h" 22 #include "ui/gfx/native_theme_win.h"
23 #include "ui/gfx/path.h" 23 #include "ui/gfx/path.h"
24 #include "views/accessibility/native_view_accessibility_win.h" 24 #include "views/accessibility/native_view_accessibility_win.h"
25 #include "views/controls/native_control_win.h" 25 #include "views/controls/native_control_win.h"
26 #include "views/controls/textfield/native_textfield_views.h" 26 #include "views/controls/textfield/native_textfield_views.h"
27 #include "views/focus/accelerator_handler.h" 27 #include "views/focus/accelerator_handler.h"
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after
852 ValidateRect(hwnd(), NULL); 852 ValidateRect(hwnd(), NULL);
853 } else { 853 } else {
854 scoped_ptr<gfx::CanvasPaint> canvas( 854 scoped_ptr<gfx::CanvasPaint> canvas(
855 gfx::CanvasPaint::CreateCanvasPaint(hwnd())); 855 gfx::CanvasPaint::CreateCanvasPaint(hwnd()));
856 delegate_->OnNativeWidgetPaint(canvas->AsCanvas()); 856 delegate_->OnNativeWidgetPaint(canvas->AsCanvas());
857 } 857 }
858 } 858 }
859 } 859 }
860 860
861 LRESULT WidgetWin::OnPowerBroadcast(DWORD power_event, DWORD data) { 861 LRESULT WidgetWin::OnPowerBroadcast(DWORD power_event, DWORD data) {
862 base::SystemMonitor* monitor = base::SystemMonitor::Get(); 862 ui::SystemMonitor* monitor = ui::SystemMonitor::Get();
863 if (monitor) 863 if (monitor)
864 monitor->ProcessWmPowerBroadcastMessage(power_event); 864 monitor->ProcessWmPowerBroadcastMessage(power_event);
865 SetMsgHandled(FALSE); 865 SetMsgHandled(FALSE);
866 return 0; 866 return 0;
867 } 867 }
868 868
869 LRESULT WidgetWin::OnReflectedMessage(UINT msg, 869 LRESULT WidgetWin::OnReflectedMessage(UINT msg,
870 WPARAM w_param, 870 WPARAM w_param,
871 LPARAM l_param) { 871 LPARAM l_param) {
872 SetMsgHandled(FALSE); 872 SetMsgHandled(FALSE);
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
1267 1267
1268 // And now, notify them that they have a brand new parent. 1268 // And now, notify them that they have a brand new parent.
1269 for (NativeWidgets::iterator it = widgets.begin(); 1269 for (NativeWidgets::iterator it = widgets.begin();
1270 it != widgets.end(); ++it) { 1270 it != widgets.end(); ++it) {
1271 (*it)->GetWidget()->NotifyNativeViewHierarchyChanged(true, 1271 (*it)->GetWidget()->NotifyNativeViewHierarchyChanged(true,
1272 new_parent); 1272 new_parent);
1273 } 1273 }
1274 } 1274 }
1275 1275
1276 } // namespace views 1276 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/native_widget_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698