Move VisibilityController to corewm.

chrome/browser/ui/views/frame/desktop_browser_frame_aura.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/frame/desktop_browser_frame_aura.h"
 
-#include "ash/wm/visibility_controller.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/views/frame/browser_desktop_root_window_host.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
+#include "ui/views/corewm/visibility_controller.h"
 #include "ui/views/view.h"
 
 using aura::Window;
 
 ///////////////////////////////////////////////////////////////////////////////
 // DesktopBrowserFrameAura, public:
 
 DesktopBrowserFrameAura::DesktopBrowserFrameAura(
     BrowserFrame* browser_frame,
     BrowserView* browser_view)
@@ skipping 14 matching lines @@
           browser_frame_,
           this,
           params.bounds,
           browser_view_,
           browser_frame_);
   views::Widget::InitParams modified_params = params;
   modified_params.desktop_root_window_host =
       browser_desktop_root_window_host_->AsDesktopRootWindowHost();
   DesktopNativeWidgetAura::InitNativeWidget(modified_params);
 
-#if defined(USE_ASH)
-  visibility_controller_.reset(new ash::internal::VisibilityController);
+  visibility_controller_.reset(new views::corewm::VisibilityController);
   aura::client::SetVisibilityClient(GetNativeView()->GetRootWindow(),
                                     visibility_controller_.get());
-  ash::SetChildWindowVisibilityChangesAnimated(
+  views::corewm::SetChildWindowVisibilityChangesAnimated(
       GetNativeView()->GetRootWindow());
-#endif
 }
 
 void DesktopBrowserFrameAura::OnWindowDestroying() {
-#if defined(USE_ASH)
   aura::client::SetVisibilityClient(GetNativeView()->GetRootWindow(), NULL);
-#endif
   DesktopNativeWidgetAura::OnWindowDestroying();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopBrowserFrameAura, NativeBrowserFrame implementation:
 
 views::NativeWidget* DesktopBrowserFrameAura::AsNativeWidget() {
   return this;
 }
 
 const views::NativeWidget* DesktopBrowserFrameAura::AsNativeWidget() const {
   return this;
 }
 
 void DesktopBrowserFrameAura::InitSystemContextMenu() {
 }
 
 int DesktopBrowserFrameAura::GetMinimizeButtonOffset() const {
   return browser_desktop_root_window_host_->GetMinimizeButtonOffset();
 }
 
 void DesktopBrowserFrameAura::TabStripDisplayModeChanged() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DesktopBrowserFrameAura, private:
 
 DesktopBrowserFrameAura::~DesktopBrowserFrameAura() {
 }