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

Unified Diff: ash/shelf/shelf_widget.cc

Issue 2243513004: mash: Partially migrate WorkspaceController to ash common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. 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
Index: ash/shelf/shelf_widget.cc
diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc
index 44c0a133a2ae060ba8786cf9ca4b978eadce8a58..f4af144be6035619d5c493c5a5ce7c85cf15cfb3 100644
--- a/ash/shelf/shelf_widget.cc
+++ b/ash/shelf/shelf_widget.cc
@@ -22,7 +22,6 @@
#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_layout_manager.h"
#include "ash/wm/status_area_layout_manager.h"
-#include "ash/wm/workspace_controller.h"
#include "base/memory/ptr_util.h"
#include "grit/ash_resources.h"
#include "ui/base/resource/resource_bundle.h"
@@ -286,8 +285,7 @@ void ShelfWidget::DelegateView::UpdateShelfAssetBackground(int alpha) {
ShelfWidget::ShelfWidget(WmWindow* shelf_container,
WmWindow* status_container,
- WmShelfAura* wm_shelf_aura,
- WorkspaceController* workspace_controller)
+ WmShelfAura* wm_shelf_aura)
: wm_shelf_aura_(wm_shelf_aura),
delegate_view_(new DelegateView(this)),
background_animator_(SHELF_BACKGROUND_DEFAULT, wm_shelf_aura_),
@@ -313,8 +311,6 @@ ShelfWidget::ShelfWidget(WmWindow* shelf_container,
shelf_layout_manager_ = new ShelfLayoutManager(this);
shelf_layout_manager_->AddObserver(this);
shelf_container->SetLayoutManager(base::WrapUnique(shelf_layout_manager_));
- shelf_layout_manager_->set_workspace_controller(workspace_controller);
- workspace_controller->SetShelf(shelf_layout_manager_);
background_animator_.PaintBackground(
shelf_layout_manager_->GetShelfBackgroundType(),
BACKGROUND_CHANGE_IMMEDIATE);

Powered by Google App Engine
This is Rietveld 408576698