chrome/browser/ui/ash/launcher/launcher_context_menu.cc - Issue 2272793005: ash: Move alignment and autohide behavior from Shelf to WmShelf

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

Issue 2272793005: ash: Move alignment and autohide behavior from Shelf to WmShelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review comments Created 4 years, 4 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 | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/launcher_context_menu.cc

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

index 552fc147cb262771b82181cc12aecd5c5c24b4d1..4840ba854497b917fa427cc06c0ab87ba0deb83e 100644

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

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

@@ -86,7 +86,7 @@ base::string16 LauncherContextMenu::GetLabelForCommandId(int command_id) const {

bool LauncherContextMenu::IsCommandIdChecked(int command_id) const {

if (command_id == MENU_AUTO_HIDE) {

- return wm_shelf_->GetAutoHideBehavior() ==

+ return wm_shelf_->auto_hide_behavior() ==

ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS;

}

DCHECK(command_id < MENU_ITEM_COUNT);

@@ -132,7 +132,7 @@ void LauncherContextMenu::ExecuteCommand(int command_id, int event_flags) {

break;

case MENU_AUTO_HIDE:

wm_shelf_->SetAutoHideBehavior(

- wm_shelf_->GetAutoHideBehavior() ==

+ wm_shelf_->auto_hide_behavior() ==

ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS

? ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER

: ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);