Move WindowModalityController to CoreWm.

chrome/browser/ui/views/constrained_window_views.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 "chrome/browser/ui/views/constrained_window_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ skipping 39 matching lines @@
 #include "ui/views/window/non_client_view.h"
 #include "ui/views/window/window_resources.h"
 #include "ui/views/window/window_shape.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "ui/base/win/shell.h"
 #include "ui/views/widget/native_widget_win.h"
 #endif
 
 #if defined(USE_AURA)
+#include "ui/aura/window.h"
 #include "ui/views/corewm/visibility_controller.h"
 #include "ui/views/corewm/window_animations.h"
+#include "ui/views/corewm/window_modality_controller.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/wm/custom_frame_view_ash.h"
-#include "ash/wm/window_modality_controller.h"
-#include "ui/aura/window.h"
 #endif
 
 using base::TimeDelta;
 
 namespace views {
 class ClientView;
 }
 
 // An enumeration of image resources used by this window.
 enum {
@@ skipping 544 matching lines @@
     registrar_.Add(this,
                    content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED,
                    content::Source<content::WebContents>(web_contents));
   }
 
   ConstrainedWindowTabHelper* constrained_window_tab_helper =
       ConstrainedWindowTabHelper::FromWebContents(web_contents_);
   constrained_window_tab_helper->AddConstrainedDialog(this);
 #if defined(USE_ASH)
   GetNativeWindow()->SetProperty(ash::kConstrainedWindowKey, true);
-  ash::SetModalParent(GetNativeWindow(),
-                      web_contents_->GetView()->GetNativeView());
+  views::corewm::SetModalParent(GetNativeWindow(),
+                                web_contents_->GetView()->GetNativeView());
 #endif
 }
 
 ConstrainedWindowViews::~ConstrainedWindowViews() {
 }
 
 void ConstrainedWindowViews::ShowConstrainedWindow() {
 #if defined(USE_AURA)
   if (enable_chrome_style_) {
     views::corewm::SetWindowVisibilityAnimationType(
@@ skipping 117 matching lines @@
     return;
   }
 #if defined(USE_ASH)
   if (is_top_level()) {
     point += web_contents_->GetNativeView()->parent()->bounds().origin().
         OffsetFromOrigin();
   }
 #endif
   SetBounds(gfx::Rect(point - gfx::Vector2d(size.width() / 2, 0), size));
 }