ui/app_list/app_list_menu.h - Issue 2133013002: AcceleratorProvider: Make GetAcceleratorForCommandId const.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/app_list/app_list_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

« no previous file with comments | « content/shell/browser/shell_views.cc ('k') | ui/app_list/app_list_menu.cc » ('j') | no next file with comments »

OLD	NEW
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 UI_APP_LIST_APP_LIST_MENU_H_	5 #ifndef UI_APP_LIST_APP_LIST_MENU_H_

6 #define UI_APP_LIST_APP_LIST_MENU_H_	6 #define UI_APP_LIST_APP_LIST_MENU_H_

7	7

8 #include "base/macros.h"	8 #include "base/macros.h"

9 #include "ui/app_list/app_list_view_delegate.h"	9 #include "ui/app_list/app_list_view_delegate.h"

10 #include "ui/base/models/simple_menu_model.h"	10 #include "ui/base/models/simple_menu_model.h"

(...skipping 18 matching lines...) Expand all Loading...
29 ~AppListMenu() override;	29 ~AppListMenu() override;

30	30

31 ui::SimpleMenuModel* menu_model() { return &menu_model_; }	31 ui::SimpleMenuModel* menu_model() { return &menu_model_; }

32	32

33 private:	33 private:

34 void InitMenu();	34 void InitMenu();

35	35

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 ui::SimpleMenuModel menu_model_;	42 ui::SimpleMenuModel menu_model_;

43 AppListViewDelegate* delegate_;	43 AppListViewDelegate* delegate_;

44 AppListViewDelegate::Users users_;	44 AppListViewDelegate::Users users_;

45	45

46 DISALLOW_COPY_AND_ASSIGN(AppListMenu);	46 DISALLOW_COPY_AND_ASSIGN(AppListMenu);

47 };	47 };

48	48

49 } // namespace app_list	49 } // namespace app_list

50	50

51 #endif // UI_APP_LIST_APP_LIST_MENU_H_	51 #endif // UI_APP_LIST_APP_LIST_MENU_H_

OLD	NEW