| Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.h
|
| diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
|
| index 5450baef084803fba005729f82973f2094961f1e..e472983acbef1608a14590ec1266fbbe5ba3daba 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
|
| +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
|
| @@ -35,6 +35,7 @@ class WindowModalityController;
|
| class DesktopRootWindowHost;
|
| class DropHelper;
|
| class NativeWidgetAuraWindowObserver;
|
| +class NativeWidgetLayerReordererAura;
|
| class TooltipManagerAura;
|
|
|
| class VIEWS_EXPORT DesktopNativeWidgetAura
|
| @@ -81,6 +82,8 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
|
| virtual ui::Compositor* GetCompositor() OVERRIDE;
|
| virtual gfx::Vector2d CalculateOffsetToAncestorWithLayer(
|
| ui::Layer** layer_parent) OVERRIDE;
|
| + virtual void ReorderLayers() OVERRIDE;
|
| + virtual bool HasNativeViewAttachedToViewTree() const OVERRIDE;
|
| virtual void ViewRemoved(View* view) OVERRIDE;
|
| virtual void SetNativeWindowProperty(const char* name, void* value) OVERRIDE;
|
| virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE;
|
| @@ -239,6 +242,10 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
|
|
|
| scoped_ptr<corewm::ShadowController> shadow_controller_;
|
|
|
| + // Reorders layers and windows based on the order of views with layers and
|
| + // views with attached windows in the widget's view hierarchy.
|
| + scoped_ptr<NativeWidgetLayerReordererAura> layer_reorderer_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
|
| };
|
|
|
|
|