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

Unified Diff: ash/wm/workspace_controller.cc

Issue 2234033002: mash: Remove WorkspaceLayoutManagerDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove WmRootWindowControllerObserver::OnFullscreenStateChanged; use ShellObserver. Created 4 years, 4 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_controller.h ('k') | no next file » | 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 99c12cd20aee455b78c41863975b3dd62a1f2212..80d1783dd7a4ff0bb3be8221efe2a0c86647c754 100644
--- a/ash/wm/workspace_controller.cc
+++ b/ash/wm/workspace_controller.cc
@@ -11,7 +11,6 @@
#include "ash/common/wm/window_state.h"
#include "ash/common/wm/workspace/workspace_layout_manager.h"
#include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
-#include "ash/common/wm/workspace/workspace_layout_manager_delegate.h"
#include "ash/root_window_controller.h"
#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shell.h"
@@ -44,14 +43,11 @@ bool IsDockedAreaVisible(const ShelfLayoutManager* shelf) {
} // namespace
-WorkspaceController::WorkspaceController(
- aura::Window* viewport,
- std::unique_ptr<wm::WorkspaceLayoutManagerDelegate> delegate)
+WorkspaceController::WorkspaceController(aura::Window* viewport)
: viewport_(viewport),
shelf_(NULL),
event_handler_(new WorkspaceEventHandler),
- layout_manager_(new WorkspaceLayoutManager(WmWindowAura::Get(viewport),
- std::move(delegate))) {
+ layout_manager_(new WorkspaceLayoutManager(WmWindowAura::Get(viewport))) {
SetWindowVisibilityAnimationTransition(viewport_, ::wm::ANIMATE_NONE);
WmWindowAura::Get(viewport_)->SetLayoutManager(
« no previous file with comments | « ash/wm/workspace_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698