Revert r114369 "Store StackingClient on RootWindow in a property."

This reverts commit da56a47ab4279016cd690e576bee1d81d414aac5.

TBR=ben@chromium.org
BUG=none
TEST=browser_tests should pass without crash

Review URL: http://codereview.chromium.org/8938015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114390 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 0 deletions

diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h
index 76f70b5..52640dc 100644
--- a/ui/aura/root_window.h
+++ b/ui/aura/root_window.h
@@ -37,6 +37,7 @@ class RootWindowObserver;
 class KeyEvent;
 class MouseEvent;
 class ScreenAura;
+class StackingClient;
 class TouchEvent;
 
 // RootWindow is responsible for hosting a set of windows.
@@ -55,10 +56,13 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
   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();
 
@@ -177,6 +181,8 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
 
   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