Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc

Issue 11316245: Move VisibilityController to corewm. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/frame/desktop_browser_frame_aura.h ('k') | ui/views/corewm/visibility_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « chrome/browser/ui/views/frame/desktop_browser_frame_aura.h ('k') | ui/views/corewm/visibility_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698