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

ui/aura/root_window.h

 // 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.
 
 #ifndef UI_AURA_ROOT_WINDOW_H_
 #define UI_AURA_ROOT_WINDOW_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
@@ skipping 19 matching lines @@
 class Transform;
 }
 
 namespace aura {
 
 class RootWindowHost;
 class RootWindowObserver;
 class KeyEvent;
 class MouseEvent;
 class ScreenAura;
-class StackingClient;
 class TouchEvent;
 
 // RootWindow is responsible for hosting a set of windows.
 class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
                                public Window,
                                public internal::FocusManager,
                                public ui::LayerAnimationObserver {
  public:
   static RootWindow* GetInstance();
   static void DeleteInstance();
 
   static void set_use_fullscreen_host_window(bool use_fullscreen) {
     use_fullscreen_host_window_ = use_fullscreen;
   }
 
   ui::Compositor* compositor() { return compositor_.get(); }
   gfx::Point last_mouse_location() const { return last_mouse_location_; }
   gfx::NativeCursor last_cursor() const { return last_cursor_; }
-  StackingClient* stacking_client() { return stacking_client_.get(); }
   Window* mouse_pressed_handler() { return mouse_pressed_handler_; }
   Window* capture_window() { return capture_window_; }
   ScreenAura* screen() { return screen_; }
 
-  void SetStackingClient(StackingClient* stacking_client);
-
   // Shows the root window host.
   void ShowRootWindow();
 
   // Sets the size of the root window.
   void SetHostSize(const gfx::Size& size);
   gfx::Size GetHostSize() const;
 
   // Shows the specified cursor.
   void SetCursor(gfx::NativeCursor cursor);
 
@@ skipping 98 matching lines @@
   void Init();
 
   // Parses the switch describing the initial size for the host window and
   // returns bounds for the window.
   gfx::Rect GetInitialHostWindowBounds() const;
 
   scoped_refptr<ui::Compositor> compositor_;
 
   scoped_ptr<RootWindowHost> host_;
 
-  scoped_ptr<StackingClient> stacking_client_;
-
   static RootWindow* instance_;
 
   // If set before the RootWindow is created, the host window will cover the
   // entire screen.  Note that this can still be overridden via the
   // switches::kAuraHostWindowSize flag.
   static bool use_fullscreen_host_window_;
 
   // Used to schedule painting.
   base::WeakPtrFactory<RootWindow> schedule_paint_factory_;
 
@@ skipping 18 matching lines @@
   Window* mouse_moved_handler_;
   Window* focused_window_;
   Window* touch_event_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindow);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ROOT_WINDOW_H_