Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(519)

Unified Diff: ash/sysui/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: rebase 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
Index: ash/sysui/context_menu_mus.cc
diff --git a/ash/sysui/context_menu_mus.cc b/ash/sysui/context_menu_mus.cc
index beafbe26781704d600cf1172bf597ded87ed4f12..6d374aa89e8a1da8bff7f9a43655204d9753b51c 100644
--- a/ash/sysui/context_menu_mus.cc
+++ b/ash/sysui/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
? SHELF_AUTO_HIDE_BEHAVIOR_NEVER
: SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
« no previous file with comments | « ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc ('k') | ash/sysui/shelf_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698