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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

Issue 194843004: Move files from ui/views/corewm to ui/wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 5 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "ui/aura/client/activation_client.h" 9 #include "ui/aura/client/activation_client.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
11 #include "ui/aura/client/cursor_client.h" 11 #include "ui/aura/client/cursor_client.h"
12 #include "ui/aura/client/drag_drop_client.h" 12 #include "ui/aura/client/drag_drop_client.h"
13 #include "ui/aura/client/focus_client.h" 13 #include "ui/aura/client/focus_client.h"
14 #include "ui/aura/client/window_tree_client.h" 14 #include "ui/aura/client/window_tree_client.h"
15 #include "ui/aura/window.h" 15 #include "ui/aura/window.h"
16 #include "ui/aura/window_event_dispatcher.h" 16 #include "ui/aura/window_event_dispatcher.h"
17 #include "ui/aura/window_observer.h" 17 #include "ui/aura/window_observer.h"
18 #include "ui/aura/window_property.h" 18 #include "ui/aura/window_property.h"
19 #include "ui/aura/window_tree_host.h" 19 #include "ui/aura/window_tree_host.h"
20 #include "ui/base/hit_test.h" 20 #include "ui/base/hit_test.h"
21 #include "ui/compositor/layer.h" 21 #include "ui/compositor/layer.h"
22 #include "ui/gfx/canvas.h" 22 #include "ui/gfx/canvas.h"
23 #include "ui/gfx/display.h" 23 #include "ui/gfx/display.h"
24 #include "ui/gfx/point_conversions.h" 24 #include "ui/gfx/point_conversions.h"
25 #include "ui/gfx/screen.h" 25 #include "ui/gfx/screen.h"
26 #include "ui/gfx/size_conversions.h" 26 #include "ui/gfx/size_conversions.h"
27 #include "ui/native_theme/native_theme.h" 27 #include "ui/native_theme/native_theme.h"
28 #include "ui/views/corewm/compound_event_filter.h"
29 #include "ui/views/corewm/corewm_switches.h"
30 #include "ui/views/corewm/cursor_manager.h"
31 #include "ui/views/corewm/focus_controller.h"
32 #include "ui/views/corewm/input_method_event_filter.h"
33 #include "ui/views/corewm/native_cursor_manager.h"
34 #include "ui/views/corewm/shadow_controller.h"
35 #include "ui/views/corewm/shadow_types.h"
36 #include "ui/views/corewm/tooltip.h" 28 #include "ui/views/corewm/tooltip.h"
37 #include "ui/views/corewm/tooltip_controller.h" 29 #include "ui/views/corewm/tooltip_controller.h"
38 #include "ui/views/corewm/visibility_controller.h"
39 #include "ui/views/corewm/window_modality_controller.h"
40 #include "ui/views/drag_utils.h" 30 #include "ui/views/drag_utils.h"
41 #include "ui/views/ime/input_method.h" 31 #include "ui/views/ime/input_method.h"
42 #include "ui/views/ime/input_method_bridge.h" 32 #include "ui/views/ime/input_method_bridge.h"
43 #include "ui/views/view_constants_aura.h" 33 #include "ui/views/view_constants_aura.h"
44 #include "ui/views/widget/desktop_aura/desktop_capture_client.h" 34 #include "ui/views/widget/desktop_aura/desktop_capture_client.h"
45 #include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater.h" 35 #include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater.h"
46 #include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h" 36 #include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h"
47 #include "ui/views/widget/desktop_aura/desktop_event_client.h" 37 #include "ui/views/widget/desktop_aura/desktop_event_client.h"
48 #include "ui/views/widget/desktop_aura/desktop_focus_rules.h" 38 #include "ui/views/widget/desktop_aura/desktop_focus_rules.h"
49 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h" 39 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h"
50 #include "ui/views/widget/desktop_aura/desktop_screen_position_client.h" 40 #include "ui/views/widget/desktop_aura/desktop_screen_position_client.h"
51 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" 41 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h"
52 #include "ui/views/widget/drop_helper.h" 42 #include "ui/views/widget/drop_helper.h"
53 #include "ui/views/widget/native_widget_aura.h" 43 #include "ui/views/widget/native_widget_aura.h"
54 #include "ui/views/widget/root_view.h" 44 #include "ui/views/widget/root_view.h"
55 #include "ui/views/widget/tooltip_manager_aura.h" 45 #include "ui/views/widget/tooltip_manager_aura.h"
56 #include "ui/views/widget/widget.h" 46 #include "ui/views/widget/widget.h"
57 #include "ui/views/widget/widget_aura_utils.h" 47 #include "ui/views/widget/widget_aura_utils.h"
58 #include "ui/views/widget/widget_delegate.h" 48 #include "ui/views/widget/widget_delegate.h"
59 #include "ui/views/widget/window_reorderer.h" 49 #include "ui/views/widget/window_reorderer.h"
50 #include "ui/wm/core/compound_event_filter.h"
51 #include "ui/wm/core/cursor_manager.h"
52 #include "ui/wm/core/focus_controller.h"
53 #include "ui/wm/core/input_method_event_filter.h"
54 #include "ui/wm/core/native_cursor_manager.h"
55 #include "ui/wm/core/shadow_controller.h"
56 #include "ui/wm/core/shadow_types.h"
57 #include "ui/wm/core/visibility_controller.h"
58 #include "ui/wm/core/window_modality_controller.h"
60 59
61 #if defined(OS_WIN) 60 #if defined(OS_WIN)
62 #include "ui/base/win/shell.h" 61 #include "ui/base/win/shell.h"
63 #include "ui/gfx/win/dpi.h" 62 #include "ui/gfx/win/dpi.h"
64 #endif 63 #endif
65 64
66 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(VIEWS_EXPORT, 65 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(VIEWS_EXPORT,
67 views::DesktopNativeWidgetAura*); 66 views::DesktopNativeWidgetAura*);
68 67
69 namespace views { 68 namespace views {
(...skipping 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after
1191 if (cursor_reference_count_ == 0) { 1190 if (cursor_reference_count_ == 0) {
1192 // We are the last DesktopNativeWidgetAura instance, and we are responsible 1191 // We are the last DesktopNativeWidgetAura instance, and we are responsible
1193 // for cleaning up |cursor_manager_|. 1192 // for cleaning up |cursor_manager_|.
1194 delete cursor_manager_; 1193 delete cursor_manager_;
1195 native_cursor_manager_ = NULL; 1194 native_cursor_manager_ = NULL;
1196 cursor_manager_ = NULL; 1195 cursor_manager_ = NULL;
1197 } 1196 }
1198 } 1197 }
1199 1198
1200 } // namespace views 1199 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698