Revert 203217 "Revert 202987 "Reorder the NativeViews attached t..."

trunk/src/ui/views/widget/desktop_aura/desktop_native_widget_aura.h

Index: trunk/src/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
===================================================================
--- trunk/src/ui/views/widget/desktop_aura/desktop_native_widget_aura.h	(revision 203401)
+++ trunk/src/ui/views/widget/desktop_aura/desktop_native_widget_aura.h	(working copy)
@@ -37,6 +37,7 @@
 class DropHelper;
 class NativeWidgetAuraWindowObserver;
 class TooltipManagerAura;
+class WindowReorderer;
 
 class VIEWS_EXPORT DesktopNativeWidgetAura
     : public internal::NativeWidgetPrivate,
@@ -82,6 +83,7 @@
   virtual const ui::Compositor* GetCompositor() const OVERRIDE;
   virtual ui::Compositor* GetCompositor() OVERRIDE;
   virtual ui::Layer* GetLayer() OVERRIDE;
+  virtual void ReorderNativeViews() OVERRIDE;
   virtual void ViewRemoved(View* view) OVERRIDE;
   virtual void SetNativeWindowProperty(const char* name, void* value) OVERRIDE;
   virtual void* GetNativeWindowProperty(const char* name) const OVERRIDE;
@@ -244,6 +246,10 @@
 
   scoped_ptr<corewm::ShadowController> shadow_controller_;
 
+  // Reorders child windows of |window_| associated with a view based on the
+  // order of the associated views in the widget's view hierarchy.
+  scoped_ptr<WindowReorderer> window_reorderer_;
+
   DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
 };