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

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

Issue 2140963002: Added default implementations of GetAcceleratorForCommandId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@acceleratorprovider-const
Patch Set: Rebase. Created 4 years, 5 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/shell_unittest.cc ('k') | ash/sysui/context_menu_mus.cc » ('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 #ifndef ASH_SYSUI_CONTEXT_MENU_MUS_H_ 5 #ifndef ASH_SYSUI_CONTEXT_MENU_MUS_H_
6 #define ASH_SYSUI_CONTEXT_MENU_MUS_H_ 6 #define ASH_SYSUI_CONTEXT_MENU_MUS_H_
7 7
8 #include "ash/common/shelf/shelf_alignment_menu.h" 8 #include "ash/common/shelf/shelf_alignment_menu.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "ui/base/models/simple_menu_model.h" 10 #include "ui/base/models/simple_menu_model.h"
11 11
12 namespace ash { 12 namespace ash {
13 13
14 class WmShelf; 14 class WmShelf;
15 15
16 // Context menu for mash. 16 // Context menu for mash.
17 // TODO(msw): Mimic logic in LauncherContextMenu. 17 // TODO(msw): Mimic logic in LauncherContextMenu.
18 class ContextMenuMus : public ui::SimpleMenuModel, 18 class ContextMenuMus : public ui::SimpleMenuModel,
19 public ui::SimpleMenuModel::Delegate { 19 public ui::SimpleMenuModel::Delegate {
20 public: 20 public:
21 explicit ContextMenuMus(WmShelf* wm_shelf); 21 explicit ContextMenuMus(WmShelf* wm_shelf);
22 ~ContextMenuMus() override; 22 ~ContextMenuMus() override;
23 23
24 // ui::SimpleMenuModel::Delegate overrides: 24 // ui::SimpleMenuModel::Delegate overrides:
25 bool IsCommandIdChecked(int command_id) const override; 25 bool IsCommandIdChecked(int command_id) const override;
26 bool IsCommandIdEnabled(int command_id) const override; 26 bool IsCommandIdEnabled(int command_id) const override;
27 bool GetAcceleratorForCommandId(int command_id,
28 ui::Accelerator* accelerator) const override;
29 void ExecuteCommand(int command_id, int event_flags) override; 27 void ExecuteCommand(int command_id, int event_flags) override;
30 28
31 private: 29 private:
32 enum MenuItem { 30 enum MenuItem {
33 MENU_AUTO_HIDE, 31 MENU_AUTO_HIDE,
34 MENU_ALIGNMENT_MENU, 32 MENU_ALIGNMENT_MENU,
35 MENU_CHANGE_WALLPAPER, 33 MENU_CHANGE_WALLPAPER,
36 }; 34 };
37 35
38 WmShelf* wm_shelf_; 36 WmShelf* wm_shelf_;
39 ShelfAlignmentMenu alignment_menu_; 37 ShelfAlignmentMenu alignment_menu_;
40 38
41 DISALLOW_COPY_AND_ASSIGN(ContextMenuMus); 39 DISALLOW_COPY_AND_ASSIGN(ContextMenuMus);
42 }; 40 };
43 41
44 } // namespace ash 42 } // namespace ash
45 43
46 #endif // ASH_SYSUI_CONTEXT_MENU_MUS_H_ 44 #endif // ASH_SYSUI_CONTEXT_MENU_MUS_H_
OLDNEW
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/sysui/context_menu_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698