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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shelf/shelf_widget.cc

Issue 1841803002: Cleanup WorkspaceController and WorkspaceLayoutManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Keep nullptr comparisons. Created 4 years, 9 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/root_window_controller.cc ('k') | ash/wm/workspace/workspace_layout_manager.h » ('j') | ash/wm/workspace/workspace_layout_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_widget.cc
diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc
index 74d5abf858bc96784bd37872caddec206e1ed9fd..e7bd0aed7c5e21bc5eb17203b09443b7da6fe93c 100644
--- a/ash/shelf/shelf_widget.cc
+++ b/ash/shelf/shelf_widget.cc
@@ -620,7 +620,7 @@ ShelfWidget::ShelfWidget(aura::Window* shelf_container,
shelf_layout_manager_->AddObserver(this);
shelf_container->SetLayoutManager(shelf_layout_manager_);
shelf_layout_manager_->set_workspace_controller(workspace_controller);
- workspace_controller->SetShelf(shelf_layout_manager_);
+ workspace_controller->set_shelf(shelf_layout_manager_);
status_area_widget_ = new StatusAreaWidget(status_container, this);
status_area_widget_->CreateTrayViews();
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/wm/workspace/workspace_layout_manager.h » ('j') | ash/wm/workspace/workspace_layout_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698