ash/mus/context_menu_mus.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: ash/mus/context_menu_mus.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

« no previous file with comments | « ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc ('k') | ash/mus/shelf_delegate_mus.cc » ('j') | ash/wm/dock/docked_window_resizer_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/mus/context_menu_mus.cc

diff --git a/ash/mus/context_menu_mus.cc b/ash/mus/context_menu_mus.cc

index 50f03a7a42862da67c90678406f658bb1ce88965..bcf139849a9be245fc0139416399df95c44e5f2f 100644

--- a/ash/mus/context_menu_mus.cc

+++ b/ash/mus/context_menu_mus.cc

@@ -29,7 +29,7 @@ ContextMenuMus::~ContextMenuMus() {}

bool ContextMenuMus::IsCommandIdChecked(int command_id) const {

if (command_id == MENU_AUTO_HIDE)

- return shelf_->GetAutoHideBehavior() == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS;

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

return false;

}

@@ -47,7 +47,7 @@ bool ContextMenuMus::GetAcceleratorForCommandId(int command_id,

void ContextMenuMus::ExecuteCommand(int command_id, int event_flags) {

if (command_id == MENU_AUTO_HIDE) {

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

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

SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS

msw 2016/05/27 22:36:40 nit: git cl format? (not your CL's fault if wrong)

James Cook 2016/05/27 22:56:26 This is the output of git cl format. :-(

? SHELF_AUTO_HIDE_BEHAVIOR_NEVER

: SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);