chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc - Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf

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_mash_shelf_controller.cc

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase again Created 4 years, 6 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_mash_shelf_controller.cc

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

index 307c87e880f95fe94dcea182a060d69e2543ccf1..1c93cc29c914bc77ab3969f2c4fb4d7d30318c8e 100644

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

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

@@ -157,7 +157,7 @@ void ChromeMashShelfController::OnAlignmentChanged(

ash::SetShelfAlignmentPref(

ProfileManager::GetActiveUserProfile()->GetPrefs(),

display::Screen::GetScreen()->GetPrimaryDisplay().id(),

- static_cast<ash::wm::ShelfAlignment>(alignment));

+ static_cast<ash::ShelfAlignment>(alignment));

}

void ChromeMashShelfController::OnAutoHideBehaviorChanged(