Move WindowModalityController to CoreWm.

ui/views/corewm/window_modality_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/window_modality_controller.h"
+#include "ui/views/corewm/window_modality_controller.h"
 
 #include <algorithm>
 
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_property.h"
 #include "ui/base/events/event.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/views/corewm/window_animations.h"
 #include "ui/views/corewm/window_util.h"
 
-namespace ash {
+namespace views {
+namespace corewm {
 
 // Transient child's modal parent.
 extern const aura::WindowProperty<aura::Window*>* const kModalParentKey;
 DEFINE_WINDOW_PROPERTY_KEY(aura::Window*, kModalParentKey, NULL);
 
 namespace {
 
 bool HasAncestor(aura::Window* window, aura::Window* ancestor) {
   if (!window)
     return false;
@@ skipping 42 matching lines @@
 void SetModalParent(aura::Window* child, aura::Window* parent) {
   child->SetProperty(kModalParentKey, parent);
 }
 
 aura::Window* GetModalTransient(aura::Window* window) {
   if (!window)
     return NULL;
 
   // We always want to check the for the transient child of the activatable
   // window.
-  aura::Window* activatable = views::corewm::GetActivatableWindow(window);
+  aura::Window* activatable = GetActivatableWindow(window);
   if (!activatable)
     return NULL;
 
   return GetModalTransientChild(activatable, window);
 }
 
-namespace internal {
-
 ////////////////////////////////////////////////////////////////////////////////
 // WindowModalityController, public:
 
 WindowModalityController::WindowModalityController() {
   aura::Env::GetInstance()->AddObserver(this);
 }
 
 WindowModalityController::~WindowModalityController() {
   aura::Env::GetInstance()->RemoveObserver(this);
   for (size_t i = 0; i < windows_.size(); ++i)
@@ skipping 41 matching lines @@
 void WindowModalityController::OnWindowDestroyed(aura::Window* window) {
   windows_.erase(std::find(windows_.begin(), windows_.end(), window));
   window->RemoveObserver(this);
 }
 
 bool WindowModalityController::ProcessLocatedEvent(aura::Window* target,
                                                    ui::LocatedEvent* event) {
   aura::Window* modal_transient_child = GetModalTransient(target);
   if (modal_transient_child && (event->type() == ui::ET_MOUSE_PRESSED ||
                                 event->type() == ui::ET_TOUCH_PRESSED)) {
-    views::corewm::AnimateWindow(modal_transient_child,
-                                 views::corewm::WINDOW_ANIMATION_TYPE_BOUNCE);
+    AnimateWindow(modal_transient_child, WINDOW_ANIMATION_TYPE_BOUNCE);
   }
   return !!modal_transient_child;
 }
 
-}  // namespace internal
-}  // namespace ash
+}  // namespace corewm
+}  // namespace views