Second attempt at moving the StackingClient to a property on the RootWindow.

ui/aura/root_window.cc

 // Copyright (c) 2011 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/aura/root_window.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "ui/aura/aura_switches.h"
 #include "ui/aura/client/activation_client.h"
-#include "ui/aura/client/drag_drop_client.h"
-#include "ui/aura/client/stacking_client.h"
-#include "ui/aura/client/tooltip_client.h"
-#include "ui/aura/client/window_drag_drop_delegate.h"
 #include "ui/aura/root_window_host.h"
 #include "ui/aura/root_window_observer.h"
 #include "ui/aura/event.h"
 #include "ui/aura/event_filter.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/screen_aura.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/compositor/compositor.h"
@@ skipping 19 matching lines @@
 
 // Returns true if |target| has a non-client (frame) component at |location|,
 // in window coordinates.
 bool IsNonClientLocation(Window* target, const gfx::Point& location) {
   if (!target->delegate())
     return false;
   int hit_test_code = target->delegate()->GetNonClientComponent(location);
   return hit_test_code != HTCLIENT && hit_test_code != HTNOWHERE;
 }
 
-class DefaultStackingClient : public StackingClient {
- public:
-  explicit DefaultStackingClient(RootWindow* root_window)
-      : root_window_(root_window) {}
-  virtual ~DefaultStackingClient() {}
-
- private:
-
-  // Overridden from StackingClient:
-  virtual void AddChildToDefaultParent(Window* window) OVERRIDE {
-    root_window_->AddChild(window);
-  }
-
-  RootWindow* root_window_;
-
-  DISALLOW_COPY_AND_ASSIGN(DefaultStackingClient);
-};
-
 typedef std::vector<EventFilter*> EventFilters;
 
 void GetEventFiltersToNotify(Window* target, EventFilters* filters) {
   Window* window = target->parent();
   while (window) {
     if (window->event_filter())
       filters->push_back(window->event_filter());
     window = window->parent();
   }
 }
@@ skipping 14 matching lines @@
   }
   return instance_;
 }
 
 // static
 void RootWindow::DeleteInstance() {
   delete instance_;
   instance_ = NULL;
 }
 
-void RootWindow::SetStackingClient(StackingClient* stacking_client) {
-  stacking_client_.reset(stacking_client);
-}
-
 void RootWindow::ShowRootWindow() {
   host_->Show();
 }
 
 void RootWindow::SetHostSize(const gfx::Size& size) {
   host_->SetSize(size);
   // Requery the location to constrain it within the new root window size.
   last_mouse_location_ = host_->QueryMouseLocation();
 }
 
@@ skipping 199 matching lines @@
   host_->ToggleFullScreen();
 }
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootWindow, private:
 
 RootWindow::RootWindow()
     : Window(NULL),
       host_(aura::RootWindowHost::Create(GetInitialHostWindowBounds())),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          stacking_client_(new DefaultStackingClient(this))),
       ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_factory_(this)),
       mouse_button_flags_(0),
       last_cursor_(kCursorNull),
       screen_(new ScreenAura),
       capture_window_(NULL),
       mouse_pressed_handler_(NULL),
       mouse_moved_handler_(NULL),
       focused_window_(NULL),
       touch_event_handler_(NULL) {
   SetName("RootWindow");
@@ skipping 203 matching lines @@
       base::StringToInt(parts[1], &parsed_height) && parsed_height > 0) {
     bounds.set_size(gfx::Size(parsed_width, parsed_height));
   } else if (use_fullscreen_host_window_) {
     bounds = gfx::Rect(RootWindowHost::GetNativeScreenSize());
   }
 
   return bounds;
 }
 
 }  // namespace aura