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 17 matching lines...) Expand all Loading... |
28 class InputMethodEventFilter; | 28 class InputMethodEventFilter; |
29 class ShadowController; | 29 class ShadowController; |
30 class TooltipController; | 30 class TooltipController; |
31 class VisibilityController; | 31 class VisibilityController; |
32 class WindowModalityController; | 32 class WindowModalityController; |
33 } | 33 } |
34 | 34 |
35 class DesktopRootWindowHost; | 35 class DesktopRootWindowHost; |
36 class DropHelper; | 36 class DropHelper; |
37 class NativeWidgetAuraWindowObserver; | 37 class NativeWidgetAuraWindowObserver; |
| 38 class NativeWidgetWindowReordererAura; |
38 class TooltipManagerAura; | 39 class TooltipManagerAura; |
39 | 40 |
40 class VIEWS_EXPORT DesktopNativeWidgetAura | 41 class VIEWS_EXPORT DesktopNativeWidgetAura |
41 : public internal::NativeWidgetPrivate, | 42 : public internal::NativeWidgetPrivate, |
42 public aura::WindowDelegate, | 43 public aura::WindowDelegate, |
43 public aura::client::ActivationDelegate, | 44 public aura::client::ActivationDelegate, |
44 public aura::client::ActivationChangeObserver, | 45 public aura::client::ActivationChangeObserver, |
45 public aura::client::FocusChangeObserver, | 46 public aura::client::FocusChangeObserver, |
46 public views::internal::InputMethodDelegate, | 47 public views::internal::InputMethodDelegate, |
47 public aura::client::DragDropDelegate { | 48 public aura::client::DragDropDelegate { |
(...skipping 25 matching lines...) Expand all Loading... |
73 virtual bool ShouldUseNativeFrame() const OVERRIDE; | 74 virtual bool ShouldUseNativeFrame() const OVERRIDE; |
74 virtual void FrameTypeChanged() OVERRIDE; | 75 virtual void FrameTypeChanged() OVERRIDE; |
75 virtual Widget* GetWidget() OVERRIDE; | 76 virtual Widget* GetWidget() OVERRIDE; |
76 virtual const Widget* GetWidget() const OVERRIDE; | 77 virtual const Widget* GetWidget() const OVERRIDE; |
77 virtual gfx::NativeView GetNativeView() const OVERRIDE; | 78 virtual gfx::NativeView GetNativeView() const OVERRIDE; |
78 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE; | 79 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE; |
79 virtual Widget* GetTopLevelWidget() OVERRIDE; | 80 virtual Widget* GetTopLevelWidget() OVERRIDE; |
80 virtual const ui::Compositor* GetCompositor() const OVERRIDE; | 81 virtual const ui::Compositor* GetCompositor() const OVERRIDE; |
81 virtual ui::Compositor* GetCompositor() OVERRIDE; | 82 virtual ui::Compositor* GetCompositor() OVERRIDE; |
82 virtual ui::Layer* GetLayer() OVERRIDE; | 83 virtual ui::Layer* GetLayer() OVERRIDE; |
| 84 virtual void ReorderNativeViews() OVERRIDE; |
83 virtual void ViewRemoved(View* view) OVERRIDE; | 85 virtual void ViewRemoved(View* view) OVERRIDE; |
84 virtual void SetNativeWindowProperty(const char* name, void* value) OVERRIDE; | 86 virtual void SetNativeWindowProperty(const char* name, void* value) OVERRIDE; |
85 virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE; | 87 virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE; |
86 virtual TooltipManager* GetTooltipManager() const OVERRIDE; | 88 virtual TooltipManager* GetTooltipManager() const OVERRIDE; |
87 virtual void SetCapture() OVERRIDE; | 89 virtual void SetCapture() OVERRIDE; |
88 virtual void ReleaseCapture() OVERRIDE; | 90 virtual void ReleaseCapture() OVERRIDE; |
89 virtual bool HasCapture() const OVERRIDE; | 91 virtual bool HasCapture() const OVERRIDE; |
90 virtual InputMethod* CreateInputMethod() OVERRIDE; | 92 virtual InputMethod* CreateInputMethod() OVERRIDE; |
91 virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE; | 93 virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE; |
92 virtual void CenterWindow(const gfx::Size& size) OVERRIDE; | 94 virtual void CenterWindow(const gfx::Size& size) OVERRIDE; |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
231 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; | 233 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; |
232 | 234 |
233 scoped_ptr<views::corewm::WindowModalityController> | 235 scoped_ptr<views::corewm::WindowModalityController> |
234 window_modality_controller_; | 236 window_modality_controller_; |
235 | 237 |
236 // See comments in OnLostActive(). | 238 // See comments in OnLostActive(). |
237 bool restore_focus_on_activate_; | 239 bool restore_focus_on_activate_; |
238 | 240 |
239 scoped_ptr<corewm::ShadowController> shadow_controller_; | 241 scoped_ptr<corewm::ShadowController> shadow_controller_; |
240 | 242 |
| 243 // Reorders child windows of |window_| associated with a view based on the |
| 244 // order of the associated views in the widget's view hierarchy. |
| 245 scoped_ptr<NativeWidgetWindowReordererAura> window_reorderer_; |
| 246 |
241 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); | 247 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); |
242 }; | 248 }; |
243 | 249 |
244 } // namespace views | 250 } // namespace views |
245 | 251 |
246 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ | 252 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ |
OLD | NEW |