ash/root_window_controller.cc - Issue 1929023002: Refactors WindowResizers to use ash/wm/common

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/root_window_controller.cc

Issue 1929023002: Refactors WindowResizers to use ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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:

Index: ash/root_window_controller.cc

diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc

index 314d9cdba9c67ca6dd438e5712c70443c3e9e3d2..7febc28522d90bdbeaaee34ff1b2a685e5a7f6d7 100644

--- a/ash/root_window_controller.cc

+++ b/ash/root_window_controller.cc

@@ -443,7 +443,7 @@ void RootWindowController::ShowShelf() {

void RootWindowController::OnShelfCreated() {

if (panel_layout_manager_)

- panel_layout_manager_->SetShelf(shelf_->shelf());

+ panel_layout_manager_->SetShelf(shelf_->shelf()->wm_shelf());

if (docked_layout_manager_) {

docked_layout_manager_->SetShelf(shelf_->shelf()->wm_shelf());

if (shelf_->shelf_layout_manager())