re-re-land of https://codereview.chromium.org/11364053/

ash/wm/stacking_controller.cc

Index: ash/wm/stacking_controller.cc
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc
index c2f6545e6aecc65c8d9762571ec1dbfa82bbc950..a9df31da6f2e5d642bda0f08dbcda6ef22e9b447 100644
--- a/ash/wm/stacking_controller.cc
+++ b/ash/wm/stacking_controller.cc
@@ -17,7 +17,6 @@
 #include "ui/base/ui_base_types.h"
 
 namespace ash {
-namespace internal {
 namespace {
 
 // Find a root window that matches the |bounds|. If the virtual screen
@@ -56,7 +55,6 @@ bool IsWindowModal(aura::Window* window) {
 // StackingController, public:
 
 StackingController::StackingController() {
-  aura::client::SetStackingClient(this);
 }
 
 StackingController::~StackingController() {
@@ -65,7 +63,8 @@ StackingController::~StackingController() {
 ////////////////////////////////////////////////////////////////////////////////
 // StackingController, aura::StackingClient implementation:
 
-aura::Window* StackingController::GetDefaultParent(aura::Window* window,
+aura::Window* StackingController::GetDefaultParent(aura::Window* context,
+                                                   aura::Window* window,
                                                    const gfx::Rect& bounds) {
   aura::RootWindow* target_root = NULL;
   if (window->transient_parent()) {
@@ -149,10 +148,9 @@ StackingController::GetAlwaysOnTopController(aura::RootWindow* root_window) {
         root_window->GetChildById(
             internal::kShellWindowId_AlwaysOnTopContainer));
     // RootWindow owns the AlwaysOnTopController object.
-    root_window->SetProperty(kAlwaysOnTopControllerKey, controller);
+    root_window->SetProperty(internal::kAlwaysOnTopControllerKey, controller);
   }
   return controller;
 }
 
-}  // namespace internal
 }  // namespace ash