Add profile selector menu to app list.

ui/app_list/app_list_menu.cc

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..dabe3d8267946f50e35ef2cece0d5fe504d25a7c 100644
--- a/ui/app_list/app_list_menu.cc
+++ b/ui/app_list/app_list_menu.cc
@@ -4,6 +4,7 @@
 
 #include "ui/app_list/app_list_menu.h"
 
+#include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -12,17 +13,40 @@
 
 namespace app_list {
 
-AppListMenu::AppListMenu(AppListViewDelegate* delegate)
+AppListMenu::AppListMenu(AppListViewDelegate* delegate,
+                         const AppListModel::Users& users)
     : menu_model_(this),
-      delegate_(delegate) {
+      delegate_(delegate),
+      users_(users) {
   InitMenu();
 }
 
 AppListMenu::~AppListMenu() {}
 
 void AppListMenu::InitMenu() {
-  menu_model_.AddItem(CURRENT_USER, base::string16());
-  menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
+  // User selector menu section. We don't show the user selector if there is
+  // only 1 user.
+  if (users_.size() > 1) {
+    for (size_t i = 0; i < users_.size(); ++i) {
+#if defined(OS_MACOSX)
+      menu_model_.AddRadioItem(SELECT_PROFILE + i,
+                               users_[i].email.empty() ? users_[i].name
+                                                       : users_[i].email,
+                               0);
+#else
+      menu_model_.AddItem(SELECT_PROFILE + i, users_[i].name, 0);
+      int menu_index = menu_model_.GetIndexOfCommandId(SELECT_PROFILE + i);
+      menu_model_.SetSublabel(menu_index, users_[i].email);
+      // Use custom check mark.
+      if (users_[i].active) {
+        ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

[tapted, 2013/09/13 23:12:17]

ugh - I guess mac complains that it's unused when the dec is outside the loop.
An option would be to duplicate the loop condition inside the #if - not sure if
that's better though.

+        menu_model_.SetIcon(i, gfx::Image(*rb.GetImageSkiaNamed(

[tapted, 2013/09/13 23:12:17]

..SetIcon(i, ..  --> ..SetIcon(menu_index, ..

[calamity, 2013/09/16 19:45:26]

Done.

+            IDR_APP_LIST_CURRENT_USER_INDICATOR)));
+      }
+#endif
+    }
+    menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
+  }
 
   menu_model_.AddItem(SHOW_SETTINGS, l10n_util::GetStringUTF16(
       IDS_APP_LIST_OPEN_SETTINGS));
@@ -35,7 +59,11 @@ void AppListMenu::InitMenu() {
 }
 
 bool AppListMenu::IsCommandIdChecked(int command_id) const {
+#if defined(OS_MACOSX)
+  return users_[command_id - SELECT_PROFILE].active;

[tapted, 2013/09/13 23:12:17]

maybe

DCHECK_LT(static_cast<unsigned>(command_id) - SELECT_PROFILE, users_.size());

I guess you could add more, like command_id < SELECT_PROFILE, but I'm pretty
sure it's redundant with but unsigned overflow rules

[calamity, 2013/09/16 19:45:26]

Done.

+#else
   return false;
+#endif
 }
 
 bool AppListMenu::IsCommandIdEnabled(int command_id) const {
@@ -48,6 +76,11 @@ bool AppListMenu::GetAcceleratorForCommandId(int command_id,
 }
 
 void AppListMenu::ExecuteCommand(int command_id, int event_flags) {
+  if (command_id >= SELECT_PROFILE) {
+    delegate_->ShowForProfileByPath(
+        users_[command_id - SELECT_PROFILE].profile_path);
+    return;
+  }
   switch (command_id) {
     case CURRENT_USER:
       break;  // Do nothing.