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

Side by Side Diff: ash/sysui/context_menu_mus.cc

Issue 2046843005: mash: Migrate shelf menus to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ash_shell_with_content Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « ash/sysui/context_menu_mus.h ('k') | ash/sysui/shell_delegate_mus.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/sysui/context_menu_mus.h" 5 #include "ash/sysui/context_menu_mus.h"
6 6
7 #include "ash/common/shelf/shelf_types.h" 7 #include "ash/common/shelf/shelf_types.h"
8 #include "ash/common/shelf/wm_shelf.h"
8 #include "ash/desktop_background/user_wallpaper_delegate.h" 9 #include "ash/desktop_background/user_wallpaper_delegate.h"
9 #include "ash/shelf/shelf.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "grit/ash_strings.h" 11 #include "grit/ash_strings.h"
12 12
13 namespace ash { 13 namespace ash {
14 14
15 ContextMenuMus::ContextMenuMus(ash::Shelf* shelf) 15 ContextMenuMus::ContextMenuMus(WmShelf* wm_shelf)
16 : ui::SimpleMenuModel(nullptr), shelf_(shelf), alignment_menu_(shelf) { 16 : ui::SimpleMenuModel(nullptr),
17 DCHECK(shelf_); 17 wm_shelf_(wm_shelf),
18 alignment_menu_(wm_shelf) {
18 set_delegate(this); 19 set_delegate(this);
19 AddCheckItemWithStringId(MENU_AUTO_HIDE, 20 AddCheckItemWithStringId(MENU_AUTO_HIDE,
20 IDS_ASH_SHELF_CONTEXT_MENU_AUTO_HIDE); 21 IDS_ASH_SHELF_CONTEXT_MENU_AUTO_HIDE);
21 AddSubMenuWithStringId(MENU_ALIGNMENT_MENU, 22 AddSubMenuWithStringId(MENU_ALIGNMENT_MENU,
22 IDS_ASH_SHELF_CONTEXT_MENU_POSITION, &alignment_menu_); 23 IDS_ASH_SHELF_CONTEXT_MENU_POSITION, &alignment_menu_);
23 #if defined(OS_CHROMEOS) 24 #if defined(OS_CHROMEOS)
24 AddItemWithStringId(MENU_CHANGE_WALLPAPER, IDS_AURA_SET_DESKTOP_WALLPAPER); 25 AddItemWithStringId(MENU_CHANGE_WALLPAPER, IDS_AURA_SET_DESKTOP_WALLPAPER);
25 #endif 26 #endif
26 } 27 }
27 28
28 ContextMenuMus::~ContextMenuMus() {} 29 ContextMenuMus::~ContextMenuMus() {}
29 30
30 bool ContextMenuMus::IsCommandIdChecked(int command_id) const { 31 bool ContextMenuMus::IsCommandIdChecked(int command_id) const {
31 if (command_id == MENU_AUTO_HIDE) 32 if (command_id == MENU_AUTO_HIDE)
32 return shelf_->auto_hide_behavior() == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS; 33 return wm_shelf_->GetAutoHideBehavior() == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS;
33 return false; 34 return false;
34 } 35 }
35 36
36 bool ContextMenuMus::IsCommandIdEnabled(int command_id) const { 37 bool ContextMenuMus::IsCommandIdEnabled(int command_id) const {
37 Shell* shell = Shell::GetInstance(); 38 Shell* shell = Shell::GetInstance();
38 if (command_id == MENU_CHANGE_WALLPAPER) 39 if (command_id == MENU_CHANGE_WALLPAPER)
39 return shell->user_wallpaper_delegate()->CanOpenSetWallpaperPage(); 40 return shell->user_wallpaper_delegate()->CanOpenSetWallpaperPage();
40 return true; 41 return true;
41 } 42 }
42 43
43 bool ContextMenuMus::GetAcceleratorForCommandId(int command_id, 44 bool ContextMenuMus::GetAcceleratorForCommandId(int command_id,
44 ui::Accelerator* accelerator) { 45 ui::Accelerator* accelerator) {
45 return false; 46 return false;
46 } 47 }
47 48
48 void ContextMenuMus::ExecuteCommand(int command_id, int event_flags) { 49 void ContextMenuMus::ExecuteCommand(int command_id, int event_flags) {
49 if (command_id == MENU_AUTO_HIDE) { 50 if (command_id == MENU_AUTO_HIDE) {
50 shelf_->SetAutoHideBehavior(shelf_->auto_hide_behavior() == 51 wm_shelf_->SetAutoHideBehavior(wm_shelf_->GetAutoHideBehavior() ==
51 SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS 52 SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS
52 ? SHELF_AUTO_HIDE_BEHAVIOR_NEVER 53 ? SHELF_AUTO_HIDE_BEHAVIOR_NEVER
53 : SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS); 54 : SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
54 } else if (command_id == MENU_CHANGE_WALLPAPER) { 55 } else if (command_id == MENU_CHANGE_WALLPAPER) {
55 Shell::GetInstance()->user_wallpaper_delegate()->OpenSetWallpaperPage(); 56 Shell::GetInstance()->user_wallpaper_delegate()->OpenSetWallpaperPage();
56 } 57 }
57 } 58 }
58 59
59 } // namespace ash 60 } // namespace ash
OLDNEW
« no previous file with comments | « ash/sysui/context_menu_mus.h ('k') | ash/sysui/shell_delegate_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698