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

Side by Side Diff: ash/common/shelf/shelf_alignment_menu.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 | « no previous file | ash/common/shelf/shelf_alignment_menu.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_COMMON_SHELF_SHELF_ALIGNMENT_MENU_H_ 5 #ifndef ASH_COMMON_SHELF_SHELF_ALIGNMENT_MENU_H_
6 #define ASH_COMMON_SHELF_SHELF_ALIGNMENT_MENU_H_ 6 #define ASH_COMMON_SHELF_SHELF_ALIGNMENT_MENU_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.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 // Submenu for choosing the alignment of the shelf. 16 // Submenu for choosing the alignment of the shelf.
17 class ASH_EXPORT ShelfAlignmentMenu : public ui::SimpleMenuModel, 17 class ASH_EXPORT ShelfAlignmentMenu : public ui::SimpleMenuModel,
18 public ui::SimpleMenuModel::Delegate { 18 public ui::SimpleMenuModel::Delegate {
19 public: 19 public:
20 explicit ShelfAlignmentMenu(WmShelf* wm_shelf); 20 explicit ShelfAlignmentMenu(WmShelf* wm_shelf);
21 ~ShelfAlignmentMenu() override; 21 ~ShelfAlignmentMenu() override;
22 22
23 // ui::SimpleMenuModel::Delegate overrides: 23 // ui::SimpleMenuModel::Delegate overrides:
24 bool IsCommandIdChecked(int command_id) const override; 24 bool IsCommandIdChecked(int command_id) const override;
25 bool IsCommandIdEnabled(int command_id) const override; 25 bool IsCommandIdEnabled(int command_id) const override;
26 bool GetAcceleratorForCommandId(int command_id,
27 ui::Accelerator* accelerator) const override;
28 void ExecuteCommand(int command_id, int event_flags) override; 26 void ExecuteCommand(int command_id, int event_flags) override;
29 27
30 private: 28 private:
31 enum MenuItem { 29 enum MenuItem {
32 // Offset so as not to interfere with other menus. 30 // Offset so as not to interfere with other menus.
33 MENU_ALIGN_LEFT = 500, 31 MENU_ALIGN_LEFT = 500,
34 MENU_ALIGN_RIGHT, 32 MENU_ALIGN_RIGHT,
35 MENU_ALIGN_BOTTOM, 33 MENU_ALIGN_BOTTOM,
36 }; 34 };
37 35
38 WmShelf* wm_shelf_; 36 WmShelf* wm_shelf_;
39 37
40 DISALLOW_COPY_AND_ASSIGN(ShelfAlignmentMenu); 38 DISALLOW_COPY_AND_ASSIGN(ShelfAlignmentMenu);
41 }; 39 };
42 40
43 } // namespace ash 41 } // namespace ash
44 42
45 #endif // ASH_COMMON_SHELF_SHELF_ALIGNMENT_MENU_H_ 43 #endif // ASH_COMMON_SHELF_SHELF_ALIGNMENT_MENU_H_
OLDNEW
« no previous file with comments | « no previous file | ash/common/shelf/shelf_alignment_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698