Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Side by Side Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.h

Issue 15114002: Reorder the NativeViews attached to a view via kViewHostKey according to the position of the view (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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 NativeWidgetLayerReordererAura;
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 26 matching lines...) Expand all
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 gfx::Vector2d CalculateOffsetToAncestorWithLayer( 83 virtual gfx::Vector2d CalculateOffsetToAncestorWithLayer(
83 ui::Layer** layer_parent) OVERRIDE; 84 ui::Layer** layer_parent) OVERRIDE;
85 virtual void ReorderLayers() OVERRIDE;
86 virtual bool HasNativeViewAttachedToViewTree() const OVERRIDE;
84 virtual void ViewRemoved(View* view) OVERRIDE; 87 virtual void ViewRemoved(View* view) OVERRIDE;
85 virtual void SetNativeWindowProperty(const char* name, void* value) OVERRIDE; 88 virtual void SetNativeWindowProperty(const char* name, void* value) OVERRIDE;
86 virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE; 89 virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE;
87 virtual TooltipManager* GetTooltipManager() const OVERRIDE; 90 virtual TooltipManager* GetTooltipManager() const OVERRIDE;
88 virtual void SetCapture() OVERRIDE; 91 virtual void SetCapture() OVERRIDE;
89 virtual void ReleaseCapture() OVERRIDE; 92 virtual void ReleaseCapture() OVERRIDE;
90 virtual bool HasCapture() const OVERRIDE; 93 virtual bool HasCapture() const OVERRIDE;
91 virtual InputMethod* CreateInputMethod() OVERRIDE; 94 virtual InputMethod* CreateInputMethod() OVERRIDE;
92 virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE; 95 virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE;
93 virtual void CenterWindow(const gfx::Size& size) OVERRIDE; 96 virtual void CenterWindow(const gfx::Size& size) OVERRIDE;
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; 235 scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
233 236
234 scoped_ptr<views::corewm::WindowModalityController> 237 scoped_ptr<views::corewm::WindowModalityController>
235 window_modality_controller_; 238 window_modality_controller_;
236 239
237 // See comments in OnLostActive(). 240 // See comments in OnLostActive().
238 bool restore_focus_on_activate_; 241 bool restore_focus_on_activate_;
239 242
240 scoped_ptr<corewm::ShadowController> shadow_controller_; 243 scoped_ptr<corewm::ShadowController> shadow_controller_;
241 244
245 // Reorders layers and windows based on the order of views with layers and
246 // views with attached windows in the widget's view hierarchy.
247 scoped_ptr<NativeWidgetLayerReordererAura> layer_reorderer_;
248
242 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 249 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
243 }; 250 };
244 251
245 } // namespace views 252 } // namespace views
246 253
247 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 254 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698