| Index: chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc (revision 170313)
|
| +++ chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc (working copy)
|
| @@ -4,7 +4,6 @@
|
|
|
| #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"
|
| @@ -21,6 +20,7 @@
|
| #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;
|
| @@ -55,19 +55,15 @@
|
| 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();
|
| }
|
|
|
|
|