OLD | NEW |
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/aura_constants.h" | 9 #include "ui/aura/client/aura_constants.h" |
10 #include "ui/aura/client/cursor_client.h" | 10 #include "ui/aura/client/cursor_client.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 #include "ui/wm/core/native_cursor_manager.h" | 54 #include "ui/wm/core/native_cursor_manager.h" |
55 #include "ui/wm/core/shadow_controller.h" | 55 #include "ui/wm/core/shadow_controller.h" |
56 #include "ui/wm/core/shadow_types.h" | 56 #include "ui/wm/core/shadow_types.h" |
57 #include "ui/wm/core/visibility_controller.h" | 57 #include "ui/wm/core/visibility_controller.h" |
58 #include "ui/wm/core/window_modality_controller.h" | 58 #include "ui/wm/core/window_modality_controller.h" |
59 #include "ui/wm/public/activation_client.h" | 59 #include "ui/wm/public/activation_client.h" |
60 #include "ui/wm/public/drag_drop_client.h" | 60 #include "ui/wm/public/drag_drop_client.h" |
61 | 61 |
62 #if defined(OS_WIN) | 62 #if defined(OS_WIN) |
63 #include "ui/base/win/shell.h" | 63 #include "ui/base/win/shell.h" |
64 #include "ui/gfx/win/dpi.h" | |
65 #endif | 64 #endif |
66 | 65 |
67 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(VIEWS_EXPORT, | 66 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(VIEWS_EXPORT, |
68 views::DesktopNativeWidgetAura*); | 67 views::DesktopNativeWidgetAura*); |
69 | 68 |
70 namespace views { | 69 namespace views { |
71 | 70 |
72 DEFINE_WINDOW_PROPERTY_KEY(DesktopNativeWidgetAura*, | 71 DEFINE_WINDOW_PROPERTY_KEY(DesktopNativeWidgetAura*, |
73 kDesktopNativeWidgetAuraKey, NULL); | 72 kDesktopNativeWidgetAuraKey, NULL); |
74 | 73 |
(...skipping 1136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1211 if (cursor_reference_count_ == 0) { | 1210 if (cursor_reference_count_ == 0) { |
1212 // We are the last DesktopNativeWidgetAura instance, and we are responsible | 1211 // We are the last DesktopNativeWidgetAura instance, and we are responsible |
1213 // for cleaning up |cursor_manager_|. | 1212 // for cleaning up |cursor_manager_|. |
1214 delete cursor_manager_; | 1213 delete cursor_manager_; |
1215 native_cursor_manager_ = NULL; | 1214 native_cursor_manager_ = NULL; |
1216 cursor_manager_ = NULL; | 1215 cursor_manager_ = NULL; |
1217 } | 1216 } |
1218 } | 1217 } |
1219 | 1218 |
1220 } // namespace views | 1219 } // namespace views |
OLD | NEW |