reland of https://codereview.chromium.org/11364053/ w/o removing the per-rootwindow stacking client

ash/wm/stacking_controller.cc

 // Copyright (c) 2012 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.
 
 #include "ash/wm/stacking_controller.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/always_on_top_controller.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/window_properties.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 
 namespace ash {
-namespace internal {
 namespace {
 
 // Find a root window that matches the |bounds|. If the virtual screen
 // coordinates is enabled and the bounds is specified, the root window
 // that matches the window's bound will be used. Otherwise, it'll
 // return the active root window.
 aura::RootWindow* FindContainerRoot(const gfx::Rect& bounds) {
   if (bounds.x() == 0 && bounds.y() == 0 && bounds.IsEmpty())
     return Shell::GetActiveRootWindow();
   return wm::GetRootWindowMatching(bounds);
@@ skipping 18 matching lines @@
   return window->transient_parent() &&
       window->GetProperty(aura::client::kModalKey) == ui::MODAL_TYPE_WINDOW;
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // StackingController, public:
 
 StackingController::StackingController() {
-  aura::client::SetStackingClient(this);
 }
 
 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()) {
     // Transient window should use the same root as its transient parent.
     target_root = window->transient_parent()->GetRootWindow();
   } else {
     target_root = FindContainerRoot(bounds);
   }
 
   switch (window->type()) {
@@ skipping 62 matching lines @@
 internal::AlwaysOnTopController*
 StackingController::GetAlwaysOnTopController(aura::RootWindow* root_window) {
   internal::AlwaysOnTopController* controller =
       root_window->GetProperty(internal::kAlwaysOnTopControllerKey);
   if (!controller) {
     controller = new internal::AlwaysOnTopController;
     controller->SetAlwaysOnTopContainer(
         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