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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_VIEWS_WIDGET_WIDGET_H_
 #define UI_VIEWS_WIDGET_WIDGET_H_
 
 #include <set>
 #include <stack>
 #include <vector>
@@ skipping 555 matching lines @@
     // non_client_view_ may be NULL, especially during creation.
     return non_client_view_ ? non_client_view_->client_view() : NULL;
   }
 
   const ui::Compositor* GetCompositor() const;
   ui::Compositor* GetCompositor();
 
   // Returns the widget's layer, if any.
   ui::Layer* GetLayer();
 
+  // Reorders the widget's child NativeViews which are associated to the view
+  // tree (eg via a NativeViewHost) to match the z-order of the views in the
+  // view tree. The z-order of views with layers relative to views with
+  // associated NativeViews is used to reorder the NativeView layers. This
+  // method assumes that the widget's child layers which are owned by a view are
+  // already in the correct z-order relative to each other and does no
+  // reordering if there are no views with an associated NativeView.
+  void ReorderNativeViews();
+
   // Schedules an update to the root layers. The actual processing occurs when
   // GetRootLayers() is invoked.
   void UpdateRootLayers();
 
   const NativeWidget* native_widget() const;
   NativeWidget* native_widget();
 
   internal::NativeWidgetPrivate* native_widget_private() {
     return native_widget_;
   }
@@ skipping 243 matching lines @@
   // True when window movement via mouse interaction with the frame should be
   // disabled.
   bool movement_disabled_;
 
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_WIDGET_H_