Revert 167245 - Currently, the ash and desktop implementations of StackingClient stomp each other in aura::Env. Instead:

- Don't have StackingClient implementations install themselves by default
- Add chrome implementation of StackingClient that dispatches to ash or desktop
- Pass extra |context| to GetDefaultParent (normally a RootWindow) that it can use to determine desktop type.
- Workaround a few locations by using ScopedForceDesktopType: in these locations, the GetHostDesktopForNative... functions fail because they're used during window creation when the windows have no parent (and so can't determine which desktop they're in).
- Remove window-specific StackingClient (unnecessary?)

BUG=128578

Review URL: https://codereview.chromium.org/11364053

TBR=scottmg@google.com

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

1 files changed, 2 insertions, 4 deletions

diff --git a/ash/shell.h b/ash/shell.h
index ad24bc5..d25998e 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -31,7 +31,6 @@ class FocusManager;
 class RootWindow;
 class Window;
 namespace client {
-class StackingClient;
 class UserActionClient;
 }
 }
@@ -100,6 +99,7 @@ class RootWindowLayoutManager;
 class ScreenPositionController;
 class ShadowController;
 class SlowAnimationEventFilter;
+class StackingController;
 class StatusAreaWidget;
 class SystemGestureEventFilter;
 class SystemModalContainerEventFilter;
@@ -410,8 +410,6 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
   }
 #endif  // defined(OS_CHROMEOS)
 
- aura::client::StackingClient* stacking_client();
-
  private:
   FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
   FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
@@ -470,7 +468,7 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
 
   scoped_ptr<internal::AppListController> app_list_controller_;
 
-  scoped_ptr<aura::client::StackingClient> stacking_client_;
+  scoped_ptr<internal::StackingController> stacking_controller_;
   scoped_ptr<internal::ActivationController> activation_controller_;
   scoped_ptr<internal::CaptureController> capture_controller_;
   scoped_ptr<internal::WindowModalityController> window_modality_controller_;