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

Side by Side Diff: chrome/browser/ui/ash/launcher/launcher_context_menu.h

Issue 2133013002: AcceleratorProvider: Make GetAcceleratorForCommandId const. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix overrides on Mac and Chrome OS. 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
OLDNEW
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 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_
7 7
8 #include "ash/common/shelf/shelf_alignment_menu.h" 8 #include "ash/common/shelf/shelf_alignment_menu.h"
9 #include "ash/common/shelf/shelf_item_types.h" 9 #include "ash/common/shelf/shelf_item_types.h"
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 18 matching lines...) Expand all
29 static LauncherContextMenu* Create(ChromeLauncherControllerImpl* controller, 29 static LauncherContextMenu* Create(ChromeLauncherControllerImpl* controller,
30 const ash::ShelfItem* item, 30 const ash::ShelfItem* item,
31 ash::WmShelf* wm_shelf); 31 ash::WmShelf* wm_shelf);
32 32
33 // ui::SimpleMenuModel::Delegate overrides: 33 // ui::SimpleMenuModel::Delegate overrides:
34 bool IsItemForCommandIdDynamic(int command_id) const override; 34 bool IsItemForCommandIdDynamic(int command_id) const override;
35 base::string16 GetLabelForCommandId(int command_id) const override; 35 base::string16 GetLabelForCommandId(int command_id) const override;
36 bool IsCommandIdChecked(int command_id) const override; 36 bool IsCommandIdChecked(int command_id) const override;
37 bool IsCommandIdEnabled(int command_id) const override; 37 bool IsCommandIdEnabled(int command_id) const override;
38 bool GetAcceleratorForCommandId(int command_id, 38 bool GetAcceleratorForCommandId(int command_id,
39 ui::Accelerator* accelerator) override; 39 ui::Accelerator* accelerator) const override;
40 void ExecuteCommand(int command_id, int event_flags) override; 40 void ExecuteCommand(int command_id, int event_flags) override;
41 41
42 protected: 42 protected:
43 enum MenuItem { 43 enum MenuItem {
44 MENU_OPEN_NEW, 44 MENU_OPEN_NEW,
45 MENU_CLOSE, 45 MENU_CLOSE,
46 MENU_PIN, 46 MENU_PIN,
47 LAUNCH_TYPE_PINNED_TAB, 47 LAUNCH_TYPE_PINNED_TAB,
48 LAUNCH_TYPE_REGULAR_TAB, 48 LAUNCH_TYPE_REGULAR_TAB,
49 LAUNCH_TYPE_FULLSCREEN, 49 LAUNCH_TYPE_FULLSCREEN,
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 ash::ShelfItem item_; 95 ash::ShelfItem item_;
96 96
97 ash::ShelfAlignmentMenu shelf_alignment_menu_; 97 ash::ShelfAlignmentMenu shelf_alignment_menu_;
98 98
99 ash::WmShelf* wm_shelf_; 99 ash::WmShelf* wm_shelf_;
100 100
101 DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu); 101 DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu);
102 }; 102 };
103 103
104 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_ 104 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698