| Index: ui/app_list/app_list_menu.cc
|
| diff --git a/ui/app_list/app_list_menu.cc b/ui/app_list/app_list_menu.cc
|
| index 95d6ac38d91b3acc2f6355b56a68e241dd00d953..6c2f88c95dc7813a23b4ae6361e90667bdedddb8 100644
|
| --- a/ui/app_list/app_list_menu.cc
|
| +++ b/ui/app_list/app_list_menu.cc
|
| @@ -7,21 +7,34 @@
|
| #include "grit/ui_strings.h"
|
| #include "ui/app_list/app_list_view_delegate.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| +#include "ui/base/models/avatar_menu_item_model.h"
|
| #include "ui/base/models/menu_separator_types.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|
| namespace app_list {
|
|
|
| -AppListMenu::AppListMenu(AppListViewDelegate* delegate)
|
| - : menu_model_(this),
|
| - delegate_(delegate) {
|
| - InitMenu();
|
| +AppListMenu::AppListMenu(
|
| + AppListViewDelegate* delegate,
|
| + std::vector<ui::AvatarMenuItemModel*>& avatar_menu_items)
|
| + : menu_model_(this),
|
| + profiles_model_(this),
|
| + delegate_(delegate) {
|
| + InitMenu(avatar_menu_items);
|
| }
|
|
|
| AppListMenu::~AppListMenu() {}
|
|
|
| -void AppListMenu::InitMenu() {
|
| - menu_model_.AddItem(CURRENT_USER, base::string16());
|
| +void AppListMenu::InitMenu(
|
| + std::vector<ui::AvatarMenuItemModel*>& avatar_menu_items) {
|
| + // Don't show the profile selector submenu if there is only one profile.
|
| + if (avatar_menu_items.size() == 1) {
|
| + menu_model_.AddItem(CURRENT_USER, base::string16());
|
| + } else {
|
| + for (size_t i = 0; i < avatar_menu_items.size(); ++i) {
|
| + profiles_model_.AddItem(SELECT_PROFILE + i, avatar_menu_items[i]->name);
|
| + }
|
| + menu_model_.AddSubMenu(CURRENT_USER, base::string16(), &profiles_model_);
|
| + }
|
| menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
|
|
|
| menu_model_.AddItem(SHOW_SETTINGS, l10n_util::GetStringUTF16(
|
| @@ -48,6 +61,11 @@ bool AppListMenu::GetAcceleratorForCommandId(int command_id,
|
| }
|
|
|
| void AppListMenu::ExecuteCommand(int command_id, int event_flags) {
|
| + if (command_id >= SELECT_PROFILE) {
|
| + delegate_->ShowForProfileAtIndex(
|
| + static_cast<size_t>(command_id - SELECT_PROFILE));
|
| + return;
|
| + }
|
| switch (command_id) {
|
| case CURRENT_USER:
|
| break; // Do nothing.
|
|
|