Move VisibilityController 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/views/corewm/visibility_controller.h"
 #include "ui/views/corewm/window_animations.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/visibility_controller.h"
 #include "ash/wm/window_modality_controller.h"
 #include "ui/aura/window.h"
 #endif
 
 using base::TimeDelta;
 
 namespace views {
 class ClientView;
 }
 
@@ skipping 508 matching lines @@
     params.parent = web_contents_->GetNativeView();
   }
 
 #if defined(USE_ASH)
   if (enable_chrome_style_) {
     params.child = false;
     DCHECK_EQ(widget_delegate->GetModalType(), ui::MODAL_TYPE_CHILD);
   }
   // Ash window headers can be transparent.
   params.transparent = true;
-  ash::SetChildWindowVisibilityChangesAnimated(params.GetParent());
+  views::corewm::SetChildWindowVisibilityChangesAnimated(params.GetParent());
   // No animations should get performed on the window since that will re-order
   // the window stack which will then cause many problems.
   if (params.parent && params.parent->parent()) {
     params.parent->parent()->SetProperty(aura::client::kAnimationsDisabledKey,
                                          true);
   }
 #endif
   Init(params);
 
   if (enable_chrome_style_) {
@@ skipping 128 matching lines @@
   web_contents_ = NULL;
 }
 
 void ConstrainedWindowViews::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(enable_chrome_style_);
   DCHECK_EQ(type, content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED);
 #if defined(USE_ASH)
-  ash::SuspendChildWindowVisibilityAnimations
+  views::corewm::SuspendChildWindowVisibilityAnimations
       suspend(GetNativeWindow()->parent());
 #endif
   if (*content::Details<bool>(details).ptr()) {
     Show();
   } else {
     Hide();
   }
 }
 
 void ConstrainedWindowViews::PositionChromeStyleWindow(const gfx::Size& size) {
   DCHECK(enable_chrome_style_);
   ConstrainedWindowTabHelperDelegate* tab_helper_delegate =
       ConstrainedWindowTabHelper::FromWebContents(web_contents_)->delegate();
   gfx::Point point;
   if (!tab_helper_delegate ||
       !tab_helper_delegate->GetConstrainedWindowTopCenter(&point)) {
     Widget::CenterWindow(size);
     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));
 }