Reorder the NativeViews attached to a view via kViewHostKey according to the position of the view

ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

 // 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.
 
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/stacking_client.h"
@@ skipping 15 matching lines @@
 #include "ui/views/corewm/corewm_switches.h"
 #include "ui/views/corewm/input_method_event_filter.h"
 #include "ui/views/corewm/shadow_controller.h"
 #include "ui/views/corewm/shadow_types.h"
 #include "ui/views/corewm/tooltip_controller.h"
 #include "ui/views/corewm/visibility_controller.h"
 #include "ui/views/corewm/window_modality_controller.h"
 #include "ui/views/drag_utils.h"
 #include "ui/views/ime/input_method.h"
 #include "ui/views/ime/input_method_bridge.h"
+#include "ui/views/view_constants_aura.h"
 #include "ui/views/widget/desktop_aura/desktop_root_window_host.h"
 #include "ui/views/widget/drop_helper.h"
 #include "ui/views/widget/native_widget_aura_window_observer.h"
+#include "ui/views/widget/native_widget_layer_reorderer_aura.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/tooltip_manager_aura.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_aura_utils.h"
 #include "ui/views/widget/widget_delegate.h"
 
 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(VIEWS_EXPORT,
                                       views::DesktopNativeWidgetAura*);
 
 namespace views {
@@ skipping 214 matching lines @@
   }
 
   window_->Show();
   desktop_root_window_host_->InitFocus(window_);
 
   aura::client::SetActivationDelegate(window_, this);
 
   shadow_controller_.reset(
       new corewm::ShadowController(
           aura::client::GetActivationClient(root_window_.get())));
+
+  layer_reorderer_.reset(new NativeWidgetLayerReordererAura(
+      window_, GetWidget()->GetRootView()));
 }
 
 NonClientFrameView* DesktopNativeWidgetAura::CreateNonClientFrameView() {
   return desktop_root_window_host_->CreateNonClientFrameView();
 }
 
 bool DesktopNativeWidgetAura::ShouldUseNativeFrame() const {
   return desktop_root_window_host_->ShouldUseNativeFrame();
 }
 
@@ skipping 29 matching lines @@
   return window_->layer()->GetCompositor();
 }
 
 gfx::Vector2d DesktopNativeWidgetAura::CalculateOffsetToAncestorWithLayer(
       ui::Layer** layer_parent) {
   if (layer_parent)
     *layer_parent = window_->layer();
   return gfx::Vector2d();
 }
 
+void DesktopNativeWidgetAura::ReorderLayers() {
+  layer_reorderer_->ReorderLayers();
+}
+
+bool DesktopNativeWidgetAura::HasNativeViewAttachedToViewTree() const {
+  // TODO(pkotwicz): Set the the kHostViewKey property when a
+  // NativeViewHost attaches a NativeView to |window_|.
+  const std::vector<aura::Window*>& child_windows = window_->children();
+  for (size_t i = 0; i < child_windows.size(); ++i) {
+    if (child_windows[i]->GetProperty(kHostViewKey))
+      return true;
+  }
+  return false;
+}
+
 void DesktopNativeWidgetAura::ViewRemoved(View* view) {
 }
 
 void DesktopNativeWidgetAura::SetNativeWindowProperty(const char* name,
                                                       void* value) {
   window_->SetNativeWindowProperty(name, value);
 }
 
 void* DesktopNativeWidgetAura::GetNativeWindowProperty(const char* name) const {
   return window_->GetNativeWindowProperty(name);
@@ skipping 507 matching lines @@
   drop_helper_->OnDragExit();
 }
 
 int DesktopNativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) {
   DCHECK(drop_helper_.get() != NULL);
   return drop_helper_->OnDrop(event.data(), event.location(),
       last_drop_operation_);
 }
 
 }  // namespace views