chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc - Issue 2886253002: mash: remove more shell/shelf WmWindow usage.

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: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

Issue 2886253002: mash: remove more shell/shelf WmWindow usage. (Closed)

Patch Set: Fix WmShelf::ForWindow. Created 3 years, 7 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: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

index 7eaebc3a2c137bd3530c78be35a8492b022a7417..2e995c809f8aca0c33af2e0ea40c276ea886078c 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

@@ -1359,7 +1359,7 @@ void ChromeLauncherController::OnDisplayConfigurationChanged() {

// Because it might be called by some operations, like crbug.com/627040

// rotating screen.

ash::WmShelf* shelf =

- ash::WmShelf::ForWindow(ash::ShellPort::Get()->GetPrimaryRootWindow());

+ ash::WmShelf::ForWindow(ash::Shell::GetPrimaryRootWindow());

if (shelf->alignment() != ash::SHELF_ALIGNMENT_BOTTOM_LOCKED)

SetShelfBehaviorsFromPrefs();

}