reland of https://codereview.chromium.org/11364053/

Two changes from that CL:
- Don't remove per-RootWindow StackingClient (erg thought he probably needed it; if not I can remove it later in a separate CL)
- Fix initialization in Shell::PlatformInitialize (wasn't initializing correctly in the CrOS case), diff between ps1 and ps2 in content/shell/shell_aura.cc

TBR=ben@chromium.org
BUG=128578

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

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

1 files changed, 8 insertions, 1 deletions

diff --git a/ash/shell.cc b/ash/shell.cc
index 11fe19f..36e61da 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -66,6 +66,7 @@
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/client/stacking_client.h"
 #include "ui/aura/client/user_action_client.h"
 #include "ui/aura/display_manager.h"
 #include "ui/aura/env.h"
@@ -454,7 +455,9 @@ void Shell::Init() {
   // Create Controllers that may need root window.
   // TODO(oshima): Move as many controllers before creating
   // RootWindowController as possible.
-  stacking_controller_.reset(new internal::StackingController);
+  stacking_client_.reset(delegate_->CreateStackingClient());
+  if (stacking_client_.get())
+    aura::client::SetStackingClient(stacking_client_.get());
   visibility_controller_.reset(new internal::VisibilityController);
   drag_drop_controller_.reset(new internal::DragDropController);
   user_action_client_.reset(delegate_->CreateUserActionClient());
@@ -763,6 +766,10 @@ void Shell::DoInitialWorkspaceAnimation() {
       DoInitialAnimation();
 }
 
+aura::client::StackingClient* Shell::stacking_client() {
+  return stacking_client_.get();
+}
+
 void Shell::InitRootWindowController(
     internal::RootWindowController* controller) {
   aura::RootWindow* root_window = controller->root_window();