| 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 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ | 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ |
| 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ | 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ |
| 7 | 7 |
| 8 #include "base/memory/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" |
| 9 #include "ui/aura/client/focus_change_observer.h" | 9 #include "ui/aura/client/focus_change_observer.h" |
| 10 #include "ui/aura/window_delegate.h" | 10 #include "ui/aura/window_delegate.h" |
| (...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 290 | 290 |
| 291 scoped_ptr<corewm::TooltipController> tooltip_controller_; | 291 scoped_ptr<corewm::TooltipController> tooltip_controller_; |
| 292 scoped_ptr<TooltipManagerAura> tooltip_manager_; | 292 scoped_ptr<TooltipManagerAura> tooltip_manager_; |
| 293 | 293 |
| 294 scoped_ptr<wm::VisibilityController> visibility_controller_; | 294 scoped_ptr<wm::VisibilityController> visibility_controller_; |
| 295 | 295 |
| 296 scoped_ptr<wm::WindowModalityController> | 296 scoped_ptr<wm::WindowModalityController> |
| 297 window_modality_controller_; | 297 window_modality_controller_; |
| 298 | 298 |
| 299 bool restore_focus_on_activate_; | 299 bool restore_focus_on_activate_; |
| 300 bool restore_focus_on_window_focus_; | |
| 301 | 300 |
| 302 gfx::NativeCursor cursor_; | 301 gfx::NativeCursor cursor_; |
| 303 // We must manually reference count the number of users of |cursor_manager_| | 302 // We must manually reference count the number of users of |cursor_manager_| |
| 304 // because the cursors created by |cursor_manager_| are shared among the | 303 // because the cursors created by |cursor_manager_| are shared among the |
| 305 // DNWAs. We can't just stuff this in a LazyInstance because we need to | 304 // DNWAs. We can't just stuff this in a LazyInstance because we need to |
| 306 // destroy this as the last DNWA happens; we can't put it off until | 305 // destroy this as the last DNWA happens; we can't put it off until |
| 307 // (potentially) after we tear down the X11 connection because that's a | 306 // (potentially) after we tear down the X11 connection because that's a |
| 308 // crash. | 307 // crash. |
| 309 static int cursor_reference_count_; | 308 static int cursor_reference_count_; |
| 310 static wm::CursorManager* cursor_manager_; | 309 static wm::CursorManager* cursor_manager_; |
| 311 static views::DesktopNativeCursorManager* native_cursor_manager_; | 310 static views::DesktopNativeCursorManager* native_cursor_manager_; |
| 312 | 311 |
| 313 scoped_ptr<wm::ShadowController> shadow_controller_; | 312 scoped_ptr<wm::ShadowController> shadow_controller_; |
| 314 | 313 |
| 315 // Reorders child windows of |window_| associated with a view based on the | 314 // Reorders child windows of |window_| associated with a view based on the |
| 316 // order of the associated views in the widget's view hierarchy. | 315 // order of the associated views in the widget's view hierarchy. |
| 317 scoped_ptr<WindowReorderer> window_reorderer_; | 316 scoped_ptr<WindowReorderer> window_reorderer_; |
| 318 | 317 |
| 319 // See class documentation for Widget in widget.h for a note about type. | 318 // See class documentation for Widget in widget.h for a note about type. |
| 320 Widget::InitParams::Type widget_type_; | 319 Widget::InitParams::Type widget_type_; |
| 321 | 320 |
| 322 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); | 321 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); |
| 323 }; | 322 }; |
| 324 | 323 |
| 325 } // namespace views | 324 } // namespace views |
| 326 | 325 |
| 327 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ | 326 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ |
| OLD | NEW |