| 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/activation_change_observer.h" | 9 #include "ui/aura/client/activation_change_observer.h" |
| 10 #include "ui/aura/client/activation_delegate.h" | 10 #include "ui/aura/client/activation_delegate.h" |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 bool restore_focus_on_activate_; | 279 bool restore_focus_on_activate_; |
| 280 | 280 |
| 281 gfx::NativeCursor cursor_; | 281 gfx::NativeCursor cursor_; |
| 282 | 282 |
| 283 scoped_ptr<corewm::ShadowController> shadow_controller_; | 283 scoped_ptr<corewm::ShadowController> shadow_controller_; |
| 284 | 284 |
| 285 // Reorders child windows of |window_| associated with a view based on the | 285 // Reorders child windows of |window_| associated with a view based on the |
| 286 // order of the associated views in the widget's view hierarchy. | 286 // order of the associated views in the widget's view hierarchy. |
| 287 scoped_ptr<WindowReorderer> window_reorderer_; | 287 scoped_ptr<WindowReorderer> window_reorderer_; |
| 288 | 288 |
| 289 // See class documentation for Widget in widget.h for a note about type. |
| 290 Widget::InitParams::Type widget_type_; |
| 291 |
| 289 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); | 292 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); |
| 290 }; | 293 }; |
| 291 | 294 |
| 292 } // namespace views | 295 } // namespace views |
| 293 | 296 |
| 294 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ | 297 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ |
| OLD | NEW |