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

Side by Side Diff: ui/app_list/app_list_menu.h

Issue 20656002: Add profile selector menu to app list. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove binary changes Created 7 years, 3 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 | « ui/app_list/app_list.gyp ('k') | ui/app_list/app_list_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 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 "ui/app_list/app_list_model.h"
8 #include "ui/base/models/simple_menu_model.h" 9 #include "ui/base/models/simple_menu_model.h"
9 10
10 namespace app_list { 11 namespace app_list {
11 12
12 class AppListViewDelegate; 13 class AppListViewDelegate;
13 14
14 // Menu for the app list. This is shown in the top right hand corner of the 15 // Menu for the app list. This is shown in the top right hand corner of the
15 // app list. 16 // app list.
16 // TODO(benwells): We should consider moving this into Chrome. 17 // TODO(benwells): We should consider moving this into Chrome.
17 class AppListMenu : public ui::SimpleMenuModel::Delegate { 18 class AppListMenu : public ui::SimpleMenuModel::Delegate {
18 public: 19 public:
19 enum AppListMenuCommands { 20 enum AppListMenuCommands {
20 CURRENT_USER, 21 CURRENT_USER,
21 SHOW_SETTINGS, 22 SHOW_SETTINGS,
22 SHOW_HELP, 23 SHOW_HELP,
23 SHOW_FEEDBACK, 24 SHOW_FEEDBACK,
25 // |SELECT_PROFILE| must remain the last enum because values greater than
26 // |SELECT_PROFILE| are used to indicate a profile index.
27 SELECT_PROFILE,
24 }; 28 };
25 29
26 explicit AppListMenu(AppListViewDelegate* delegate); 30 AppListMenu(
31 AppListViewDelegate* delegate,
32 const AppListModel::Users& users);
27 virtual ~AppListMenu(); 33 virtual ~AppListMenu();
28 34
29 ui::SimpleMenuModel* menu_model() { return &menu_model_; } 35 ui::SimpleMenuModel* menu_model() { return &menu_model_; }
30 36
31 private: 37 private:
32 void InitMenu(); 38 void InitMenu();
33 39
34 virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; 40 virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
35 virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; 41 virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
36 virtual bool GetAcceleratorForCommandId( 42 virtual bool GetAcceleratorForCommandId(
37 int command_id, 43 int command_id,
38 ui::Accelerator* accelerator) OVERRIDE; 44 ui::Accelerator* accelerator) OVERRIDE;
39 virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; 45 virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
40 46
41 ui::SimpleMenuModel menu_model_; 47 ui::SimpleMenuModel menu_model_;
42 AppListViewDelegate* delegate_; 48 AppListViewDelegate* delegate_;
49 AppListModel::Users users_;
43 50
44 DISALLOW_COPY_AND_ASSIGN(AppListMenu); 51 DISALLOW_COPY_AND_ASSIGN(AppListMenu);
45 }; 52 };
46 53
47 } // namespace app_list 54 } // namespace app_list
48 55
49 #endif // UI_APP_LIST_APP_LIST_MENU_H_ 56 #endif // UI_APP_LIST_APP_LIST_MENU_H_
OLDNEW
« no previous file with comments | « ui/app_list/app_list.gyp ('k') | ui/app_list/app_list_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698