chrome/browser/ui/ash/launcher/launcher_context_menu.cc - Issue 2020623004: ash: Move shelf alignment and auto-hide calls from Shell to 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/launcher_context_menu.cc

Issue 2020623004: ash: Move shelf alignment and auto-hide calls from Shell to Shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: typo Created 4 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:

View side-by-side diff with in-line comments

Download patch

« ash/wm/dock/docked_window_resizer_unittest.cc ('K') | « chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.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 0544d310c3434545052100c04e4c78f3c6a9ed69..7e98c008d8b9fda85f6b90c98e999db014754061 100644

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

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

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

bool LauncherContextMenu::IsCommandIdChecked(int command_id) const {

if (command_id == MENU_AUTO_HIDE) {

msw 2016/05/27 22:36:41 nit: remove curlies

- return shelf_->GetAutoHideBehavior() ==

- ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS;

+ return shelf_->auto_hide_behavior() == ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS;

}

DCHECK(command_id < MENU_ITEM_COUNT);

return false;

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

controller_->TogglePinned(item_.id);

break;

case MENU_AUTO_HIDE:

- shelf_->SetAutoHideBehavior(shelf_->GetAutoHideBehavior() ==

+ shelf_->SetAutoHideBehavior(shelf_->auto_hide_behavior() ==

ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS

? ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER

: ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);