Eliminates all ash dependencies from WindowModalityController.

ui/views/widget/desktop_aura/desktop_activation_client.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 "ui/views/widget/desktop_aura/desktop_activation_client.h"
 
 #include "base/auto_reset.h"
 #include "base/compiler_specific.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/client/activation_change_observer.h"
@@ skipping 82 matching lines @@
 
 void DesktopActivationClient::DeactivateWindow(aura::Window* window) {
   if (window == current_active_)
     current_active_ = NULL;
 }
 
 aura::Window* DesktopActivationClient::GetActiveWindow() {
   return current_active_;
 }
 
+aura::Window* DesktopActivationClient::GetActivatableWindow(
+    aura::Window* window) {
+  aura::Window* parent = window->parent();
+  aura::Window* child = window;
+  while (parent) {
+    if (CanActivateWindow(child))
+      return child;
+    // If |child| isn't activatable, but has transient parent, trace
+    // that path instead.
+    if (child->transient_parent())
+      return GetActivatableWindow(child->transient_parent());
+    parent = parent->parent();
+    child = child->parent();
+  }
+  return NULL;
+}
+
 bool DesktopActivationClient::OnWillFocusWindow(aura::Window* window,
                                                 const ui::Event* event) {
   return CanActivateWindow(GetActivatableWindow(window));
 }
 
 void DesktopActivationClient::OnWindowDestroying(aura::Window* window) {
   if (current_active_ == window) {
     current_active_ = NULL;
     FOR_EACH_OBSERVER(aura::client::ActivationChangeObserver,
                       observers_,
@@ skipping 36 matching lines @@
 
 ui::EventResult DesktopActivationClient::OnGestureEvent(
     ui::GestureEvent* event) {
   if (event->type() == ui::ET_GESTURE_BEGIN &&
       event->details().touch_points() == 1) {
     FocusWindowWithEvent(event);
   }
   return ui::ER_UNHANDLED;
 }
 
-aura::Window* DesktopActivationClient::GetActivatableWindow(
-    aura::Window* window) {
-  aura::Window* parent = window->parent();
-  aura::Window* child = window;
-  while (parent) {
-    if (CanActivateWindow(child))
-      return child;
-    // If |child| isn't activatable, but has transient parent, trace
-    // that path instead.
-    if (child->transient_parent())
-      return GetActivatableWindow(child->transient_parent());
-    parent = parent->parent();
-    child = child->parent();
-  }
-  return NULL;
-}
-
 void DesktopActivationClient::FocusWindowWithEvent(const ui::Event* event) {
   aura::Window* window = static_cast<aura::Window*>(event->target());
   if (GetActiveWindow() != window) {
     aura::client::GetFocusClient(window)->FocusWindow(
         FindFocusableWindowFor(window), event);
   }
 }
 
 }  // namespace views