Eliminates all ash dependencies from WindowModalityController.

ash/wm/ash_activation_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/ash_activation_controller.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/property_util.h"
@@ skipping 11 matching lines @@
 }
 
 AshActivationController::~AshActivationController() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AshActivationController, ActivationControllerDelegate implementation:
 
 aura::Window* AshActivationController::WillActivateWindow(
     aura::Window* window) {
-  aura::Window* window_modal_transient = wm::GetModalTransient(window);
+  aura::Window* window_modal_transient = GetModalTransient(window);
   if (window_modal_transient)
     return window_modal_transient;
 
   // Make sure the workspace manager switches to the workspace for window.
   // Without this CanReceiveEvents() below returns false and activation never
   // changes. CanReceiveEvents() returns false if |window| isn't in the active
   // workspace, in which case its parent is not visible.
   // TODO(sky): if I instead change the opacity of the parent this isn't an
   // issue, but will make animations trickier... Consider which one is better.
   if (window) {
@@ skipping 19 matching lines @@
   //             Shell.
   if (window) {
     DCHECK(window->GetRootWindow());
     Shell::GetInstance()->set_active_root_window(window->GetRootWindow());
   }
   return window;
 }
 
 aura::Window* AshActivationController::WillFocusWindow(
     aura::Window* window) {
-  aura::Window* window_modal_transient = wm::GetModalTransient(window);
+  aura::Window* window_modal_transient = GetModalTransient(window);
   if (window_modal_transient)
     return window_modal_transient;
   return window;
 }
 
 }  // namespace internal
 }  // namespace ash