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

Unified Diff: ash/shell/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: 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
« no previous file with comments | « ash/shell.cc ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/context_menu.cc
diff --git a/ash/shell/context_menu.cc b/ash/shell/context_menu.cc
index c07c547e4ce26b1255f978eee4784a011094df2f..c38b0e49553a3639aff89e98fa446f9e3c9d5e0d 100644
--- a/ash/shell/context_menu.cc
+++ b/ash/shell/context_menu.cc
@@ -27,7 +27,7 @@ ContextMenu::~ContextMenu() {
bool ContextMenu::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;
}
@@ -42,7 +42,7 @@ bool ContextMenu::GetAcceleratorForCommandId(int command_id,
void ContextMenu::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/shell.cc ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698