| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/shell/context_menu.h" | 5 #include "ash/shell/context_menu.h" |
| 6 | 6 |
| 7 #include "ash/common/shelf/shelf_types.h" | 7 #include "ash/common/shelf/shelf_types.h" |
| 8 #include "ash/shelf/shelf.h" | 8 #include "ash/common/shelf/wm_shelf.h" |
| 9 #include "grit/ash_strings.h" | 9 #include "grit/ash_strings.h" |
| 10 | 10 |
| 11 namespace ash { | 11 namespace ash { |
| 12 namespace shell { | 12 namespace shell { |
| 13 | 13 |
| 14 ContextMenu::ContextMenu(ash::Shelf* shelf) | 14 ContextMenu::ContextMenu(WmShelf* wm_shelf) |
| 15 : ui::SimpleMenuModel(nullptr), shelf_(shelf), alignment_menu_(shelf) { | 15 : ui::SimpleMenuModel(nullptr), |
| 16 DCHECK(shelf_); | 16 wm_shelf_(wm_shelf), |
| 17 alignment_menu_(wm_shelf) { |
| 18 DCHECK(wm_shelf_); |
| 17 set_delegate(this); | 19 set_delegate(this); |
| 18 AddCheckItemWithStringId(MENU_AUTO_HIDE, | 20 AddCheckItemWithStringId(MENU_AUTO_HIDE, |
| 19 IDS_ASH_SHELF_CONTEXT_MENU_AUTO_HIDE); | 21 IDS_ASH_SHELF_CONTEXT_MENU_AUTO_HIDE); |
| 20 AddSubMenuWithStringId(MENU_ALIGNMENT_MENU, | 22 AddSubMenuWithStringId(MENU_ALIGNMENT_MENU, |
| 21 IDS_ASH_SHELF_CONTEXT_MENU_POSITION, | 23 IDS_ASH_SHELF_CONTEXT_MENU_POSITION, |
| 22 &alignment_menu_); | 24 &alignment_menu_); |
| 23 } | 25 } |
| 24 | 26 |
| 25 ContextMenu::~ContextMenu() { | 27 ContextMenu::~ContextMenu() { |
| 26 } | 28 } |
| 27 | 29 |
| 28 bool ContextMenu::IsCommandIdChecked(int command_id) const { | 30 bool ContextMenu::IsCommandIdChecked(int command_id) const { |
| 29 if (command_id == MENU_AUTO_HIDE) | 31 if (command_id == MENU_AUTO_HIDE) |
| 30 return shelf_->auto_hide_behavior() == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS; | 32 return wm_shelf_->GetAutoHideBehavior() == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS; |
| 31 return false; | 33 return false; |
| 32 } | 34 } |
| 33 | 35 |
| 34 bool ContextMenu::IsCommandIdEnabled(int command_id) const { | 36 bool ContextMenu::IsCommandIdEnabled(int command_id) const { |
| 35 return true; | 37 return true; |
| 36 } | 38 } |
| 37 | 39 |
| 38 bool ContextMenu::GetAcceleratorForCommandId(int command_id, | 40 bool ContextMenu::GetAcceleratorForCommandId(int command_id, |
| 39 ui::Accelerator* accelerator) { | 41 ui::Accelerator* accelerator) { |
| 40 return false; | 42 return false; |
| 41 } | 43 } |
| 42 | 44 |
| 43 void ContextMenu::ExecuteCommand(int command_id, int event_flags) { | 45 void ContextMenu::ExecuteCommand(int command_id, int event_flags) { |
| 44 if (command_id == MENU_AUTO_HIDE) { | 46 if (command_id == MENU_AUTO_HIDE) { |
| 45 shelf_->SetAutoHideBehavior(shelf_->auto_hide_behavior() == | 47 wm_shelf_->SetAutoHideBehavior(wm_shelf_->GetAutoHideBehavior() == |
| 46 SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS | 48 SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS |
| 47 ? SHELF_AUTO_HIDE_BEHAVIOR_NEVER | 49 ? SHELF_AUTO_HIDE_BEHAVIOR_NEVER |
| 48 : SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS); | 50 : SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS); |
| 49 } | 51 } |
| 50 } | 52 } |
| 51 | 53 |
| 52 } // namespace shell | 54 } // namespace shell |
| 53 } // namespace ash | 55 } // namespace ash |
| OLD | NEW |