ash/shelf/shelf_widget.cc - Issue 1841803002: Cleanup WorkspaceController and WorkspaceLayoutManager.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Check if the container is kShellWindowId_DefaultContainer instead. Created 4 years, 8 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 1a3e9b6bccfb0d65290f0053e0944c0ba3d8f8de..08565d12f1932755b7e194833455f126f45214df 100644

--- a/ash/shelf/shelf_widget.cc

+++ b/ash/shelf/shelf_widget.cc

@@ -618,7 +618,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') | no next file with comments »