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

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

Issue 2461493002: Moves DragDropClient to aura/client (Closed)
Patch Set: Created 4 years, 1 month 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
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/macros.h" 8 #include "base/macros.h"
9 #include "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "ui/aura/client/aura_constants.h" 11 #include "ui/aura/client/aura_constants.h"
12 #include "ui/aura/client/cursor_client.h" 12 #include "ui/aura/client/cursor_client.h"
13 #include "ui/aura/client/drag_drop_client.h"
13 #include "ui/aura/client/focus_client.h" 14 #include "ui/aura/client/focus_client.h"
14 #include "ui/aura/client/window_parenting_client.h" 15 #include "ui/aura/client/window_parenting_client.h"
15 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
16 #include "ui/aura/window_observer.h" 17 #include "ui/aura/window_observer.h"
17 #include "ui/aura/window_property.h" 18 #include "ui/aura/window_property.h"
18 #include "ui/aura/window_tree_host.h" 19 #include "ui/aura/window_tree_host.h"
19 #include "ui/base/hit_test.h" 20 #include "ui/base/hit_test.h"
20 #include "ui/base/ime/input_method.h" 21 #include "ui/base/ime/input_method.h"
21 #include "ui/compositor/layer.h" 22 #include "ui/compositor/layer.h"
22 #include "ui/display/screen.h" 23 #include "ui/display/screen.h"
(...skipping 26 matching lines...) Expand all
49 #include "ui/wm/core/compound_event_filter.h" 50 #include "ui/wm/core/compound_event_filter.h"
50 #include "ui/wm/core/cursor_manager.h" 51 #include "ui/wm/core/cursor_manager.h"
51 #include "ui/wm/core/focus_controller.h" 52 #include "ui/wm/core/focus_controller.h"
52 #include "ui/wm/core/native_cursor_manager.h" 53 #include "ui/wm/core/native_cursor_manager.h"
53 #include "ui/wm/core/shadow_controller.h" 54 #include "ui/wm/core/shadow_controller.h"
54 #include "ui/wm/core/shadow_types.h" 55 #include "ui/wm/core/shadow_types.h"
55 #include "ui/wm/core/visibility_controller.h" 56 #include "ui/wm/core/visibility_controller.h"
56 #include "ui/wm/core/window_animations.h" 57 #include "ui/wm/core/window_animations.h"
57 #include "ui/wm/core/window_modality_controller.h" 58 #include "ui/wm/core/window_modality_controller.h"
58 #include "ui/wm/public/activation_client.h" 59 #include "ui/wm/public/activation_client.h"
59 #include "ui/wm/public/drag_drop_client.h"
60 60
61 #if defined(OS_WIN) 61 #if defined(OS_WIN)
62 #include "ui/base/win/shell.h" 62 #include "ui/base/win/shell.h"
63 #endif 63 #endif
64 64
65 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(VIEWS_EXPORT, 65 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(VIEWS_EXPORT,
66 views::DesktopNativeWidgetAura*); 66 views::DesktopNativeWidgetAura*);
67 67
68 namespace views { 68 namespace views {
69 69
(...skipping 1116 matching lines...) Expand 10 before | Expand all | Expand 10 after
1186 if (cursor_reference_count_ == 0) { 1186 if (cursor_reference_count_ == 0) {
1187 // We are the last DesktopNativeWidgetAura instance, and we are responsible 1187 // We are the last DesktopNativeWidgetAura instance, and we are responsible
1188 // for cleaning up |cursor_manager_|. 1188 // for cleaning up |cursor_manager_|.
1189 delete cursor_manager_; 1189 delete cursor_manager_;
1190 native_cursor_manager_ = NULL; 1190 native_cursor_manager_ = NULL;
1191 cursor_manager_ = NULL; 1191 cursor_manager_ = NULL;
1192 } 1192 }
1193 } 1193 }
1194 1194
1195 } // namespace views 1195 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_drop_target_win.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698