Chromium Code Reviews| Index: ui/app_list/app_list_menu.h |
| diff --git a/ui/app_list/app_list_menu.h b/ui/app_list/app_list_menu.h |
| index ff4be49e4c59f89d9940ae3ea88ed9f412d76cd9..d9a0e1ebf1285bef2fa01f285ffe452ac755064e 100644 |
| --- a/ui/app_list/app_list_menu.h |
| +++ b/ui/app_list/app_list_menu.h |
| @@ -5,8 +5,15 @@ |
| #ifndef UI_APP_LIST_APP_LIST_MENU_H_ |
| #define UI_APP_LIST_APP_LIST_MENU_H_ |
| +#include <vector> |
|
tapted
2013/08/05 03:01:39
I guess the header doesn't need this any more, sin
calamity
2013/08/08 04:52:12
Done.
|
| + |
| +#include "ui/app_list/app_list_model.h" |
| #include "ui/base/models/simple_menu_model.h" |
| +namespace ui { |
| +struct AvatarMenuItemModel; |
| +} |
| + |
| namespace app_list { |
| class AppListViewDelegate; |
| @@ -21,9 +28,14 @@ class AppListMenu : public ui::SimpleMenuModel::Delegate { |
| SHOW_SETTINGS, |
| SHOW_HELP, |
| SHOW_FEEDBACK, |
| + // |SELECT_PROFILE| must remain the last enum because values greater than |
| + // |SELECT_PROFILE| are used to indicate a profile index. |
| + SELECT_PROFILE, |
| }; |
| - explicit AppListMenu(AppListViewDelegate* delegate); |
| + AppListMenu( |
| + AppListViewDelegate* delegate, |
| + const app_list::AppListModel::ProfileMenuItems& profile_menu_items); |
|
tapted
2013/08/05 03:01:39
nit: doesn't need app_list::
calamity
2013/08/08 04:52:12
Done.
calamity
2013/08/08 04:52:12
Done.
|
| virtual ~AppListMenu(); |
| ui::SimpleMenuModel* menu_model() { return &menu_model_; } |
| @@ -39,7 +51,9 @@ class AppListMenu : public ui::SimpleMenuModel::Delegate { |
| virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; |
| ui::SimpleMenuModel menu_model_; |
| + ui::SimpleMenuModel profiles_model_; |
| AppListViewDelegate* delegate_; |
| + const app_list::AppListModel::ProfileMenuItems& profile_menu_items_; |
|
tapted
2013/08/05 03:01:39
I don't usually see things declared this way in Ch
koz (OOO until 15th September)
2013/08/05 03:52:13
Right - this should probably be a value.
calamity
2013/08/08 04:52:12
Done.
|
| DISALLOW_COPY_AND_ASSIGN(AppListMenu); |
| }; |