make StackingClient dispatch to either ash or desktop

ui/views/widget/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_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "ui/aura/client/stacking_client.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
@@ skipping 11 matching lines @@
 #include "ui/views/widget/widget_aura_utils.h"
 
 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(VIEWS_EXPORT,
                                       views::DesktopNativeWidgetAura*);
 
 namespace views {
 
 DEFINE_WINDOW_PROPERTY_KEY(DesktopNativeWidgetAura*,
                            kDesktopNativeWidgetAuraKey, NULL);
 
-namespace {
-
-class DesktopNativeWidgetAuraStackingClient :
-    public aura::client::StackingClient {
- public:
-  explicit DesktopNativeWidgetAuraStackingClient(aura::RootWindow* root_window)
-      : root_window_(root_window) {
-    aura::client::SetStackingClient(root_window_, this);
-  }
-  virtual ~DesktopNativeWidgetAuraStackingClient() {
-    aura::client::SetStackingClient(root_window_, NULL);
-  }
-
-  // Overridden from client::StackingClient:
-  virtual aura::Window* GetDefaultParent(aura::Window* window,
-                                         const gfx::Rect& bounds) OVERRIDE {
-    return root_window_;
-  }
-
- private:
-  aura::RootWindow* root_window_;
-
-  DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAuraStackingClient);
-};
-
-}  // namespace
-
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetAura, public:
 
 DesktopNativeWidgetAura::DesktopNativeWidgetAura(
     internal::NativeWidgetDelegate* delegate)
     : ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET),
       ALLOW_THIS_IN_INITIALIZER_LIST(close_widget_factory_(this)),
       can_activate_(true),
       desktop_root_window_host_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(window_(new aura::Window(this))),
@@ skipping 32 matching lines @@
   window_->SetTransparent(true);
   window_->Init(params.layer_type);
   window_->Show();
 
   desktop_root_window_host_ = params.desktop_root_window_host ?
       params.desktop_root_window_host :
       DesktopRootWindowHost::Create(native_widget_delegate_,
                                     this, params.bounds);
   root_window_.reset(
       desktop_root_window_host_->Init(window_, params));
-  stacking_client_.reset(
-      new DesktopNativeWidgetAuraStackingClient(root_window_.get()));
 
   aura::client::SetActivationDelegate(window_, this);
 }
 
 NonClientFrameView* DesktopNativeWidgetAura::CreateNonClientFrameView() {
   return desktop_root_window_host_->CreateNonClientFrameView();
 }
 
 bool DesktopNativeWidgetAura::ShouldUseNativeFrame() const {
   return desktop_root_window_host_->ShouldUseNativeFrame();
@@ skipping 448 matching lines @@
     GetWidget()->non_client_view()->SchedulePaint();
 }
 
 void DesktopNativeWidgetAura::OnLostActive() {
   native_widget_delegate_->OnNativeWidgetActivationChanged(false);
   if (IsVisible() && GetWidget()->non_client_view())
     GetWidget()->non_client_view()->SchedulePaint();
 }
 
 }  // namespace views