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

Unified Diff: ash/wm/workspace_controller.cc

Issue 2908793002: [mus+ash] Removes WmWindow from ash/wm/overview and ash/wm/workspace (Closed)
Patch Set: Created 3 years, 7 months 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 | « ash/wm/workspace/workspace_window_resizer_unittest.cc ('k') | ash/wm_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace_controller.cc
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
index 4687dfc83c6cdf469a459f79740ab18b19d806b5..8017164f4d17a58adb380985af4a037694310665 100644
--- a/ash/wm/workspace_controller.cc
+++ b/ash/wm/workspace_controller.cc
@@ -17,10 +17,10 @@
#include "ash/wm/workspace/backdrop_delegate.h"
#include "ash/wm/workspace/workspace_event_handler.h"
#include "ash/wm/workspace/workspace_layout_manager.h"
-#include "ash/wm_window.h"
#include "ui/aura/window.h"
#include "ui/compositor/layer.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
+#include "ui/wm/core/window_animations.h"
namespace ash {
namespace {
@@ -36,8 +36,7 @@ const int kInitialAnimationDurationMS = 200;
WorkspaceController::WorkspaceController(aura::Window* viewport)
: viewport_(viewport),
- event_handler_(ShellPort::Get()->CreateWorkspaceEventHandler(
- WmWindow::Get(viewport))),
+ event_handler_(ShellPort::Get()->CreateWorkspaceEventHandler(viewport)),
layout_manager_(new WorkspaceLayoutManager(viewport)) {
viewport_->AddObserver(this);
::wm::SetWindowVisibilityAnimationTransition(viewport_, ::wm::ANIMATE_NONE);
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer_unittest.cc ('k') | ash/wm_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698