| 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/macros.h" | 
| 8 #include "base/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" | 
|  | 10 #include "build/build_config.h" | 
| 9 #include "ui/aura/client/aura_constants.h" | 11 #include "ui/aura/client/aura_constants.h" | 
| 10 #include "ui/aura/client/cursor_client.h" | 12 #include "ui/aura/client/cursor_client.h" | 
| 11 #include "ui/aura/client/focus_client.h" | 13 #include "ui/aura/client/focus_client.h" | 
| 12 #include "ui/aura/client/window_tree_client.h" | 14 #include "ui/aura/client/window_tree_client.h" | 
| 13 #include "ui/aura/window.h" | 15 #include "ui/aura/window.h" | 
| 14 #include "ui/aura/window_observer.h" | 16 #include "ui/aura/window_observer.h" | 
| 15 #include "ui/aura/window_property.h" | 17 #include "ui/aura/window_property.h" | 
| 16 #include "ui/aura/window_tree_host.h" | 18 #include "ui/aura/window_tree_host.h" | 
| 17 #include "ui/base/hit_test.h" | 19 #include "ui/base/hit_test.h" | 
| 18 #include "ui/base/ime/input_method.h" | 20 #include "ui/base/ime/input_method.h" | 
| (...skipping 1183 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1202   if (cursor_reference_count_ == 0) { | 1204   if (cursor_reference_count_ == 0) { | 
| 1203     // We are the last DesktopNativeWidgetAura instance, and we are responsible | 1205     // We are the last DesktopNativeWidgetAura instance, and we are responsible | 
| 1204     // for cleaning up |cursor_manager_|. | 1206     // for cleaning up |cursor_manager_|. | 
| 1205     delete cursor_manager_; | 1207     delete cursor_manager_; | 
| 1206     native_cursor_manager_ = NULL; | 1208     native_cursor_manager_ = NULL; | 
| 1207     cursor_manager_ = NULL; | 1209     cursor_manager_ = NULL; | 
| 1208   } | 1210   } | 
| 1209 } | 1211 } | 
| 1210 | 1212 | 
| 1211 }  // namespace views | 1213 }  // namespace views | 
| OLD | NEW | 
|---|