Add profile selector menu to app list.

chrome/browser/ui/app_list/app_list_view_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/app_list_view_delegate.h"
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
+#include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/feedback/feedback_util.h"
+#include "chrome/browser/profiles/profile_info_cache.h"
+#include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/apps_model_builder.h"
 #include "chrome/browser/ui/app_list/chrome_app_list_item.h"
 #include "chrome/browser/ui/app_list/chrome_signin_delegate.h"
 #include "chrome/browser/ui/app_list/search/search_controller.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/web_applications/web_app_ui.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/user_metrics.h"
+#include "ui/base/models/avatar_menu_item_model.h"
 
 #if defined(USE_ASH)
 #include "chrome/browser/ui/ash/app_list/app_sync_ui_state_watcher.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/web_applications/web_app_win.h"
 #endif
 
 namespace {
@@ skipping 13 matching lines @@
 
 }  // namespace
 
 AppListViewDelegate::AppListViewDelegate(AppListControllerDelegate* controller,
                                          Profile* profile)
     : controller_(controller),
       profile_(profile) {}
 
 AppListViewDelegate::~AppListViewDelegate() {}
 
+void AppListViewDelegate::SetProfile(Profile* profile) {
+  profile_ = profile;

[benwells, 2013/07/31 05:47:13]

Shouldn't this rebuild models and suchlike? Feels strange that it doesn't,
although the name is accurate.

[calamity, 2013/08/01 08:35:45]

Done.

+}
+
 void AppListViewDelegate::SetModel(app_list::AppListModel* model) {

[benwells, 2013/07/31 05:47:13]

This name is really bad. It rebuilds the whole model, not just setting it.

[calamity, 2013/08/01 08:35:45]

Done. Switched to InitModel.

   if (model) {
+    ProfileInfoCache& cache =
+        g_browser_process->profile_manager()->GetProfileInfoCache();
+
+    // Initialize the current user details.
+    size_t profile_index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
+    if (profile_index == std::string::npos)
+      NOTREACHED();

[tapted, 2013/07/31 05:43:53]

maybe DCHECK_NE(std::string::npos, profile_index), assuming it "can't" happen

[calamity, 2013/08/01 08:35:45]

Done.

+    model->SetCurrentUser(cache.GetNameOfProfileAtIndex(profile_index),
+                          cache.GetUserNameOfProfileAtIndex(profile_index));
+
+    // Initialize the profile menu.
+    RebuildAvatarMenuItems(model);
+
+    // Initialize apps model.
     apps_builder_.reset(new AppsModelBuilder(profile_,
                                              model->apps(),
                                              controller_.get()));
     apps_builder_->Build();
 
     search_controller_.reset(new app_list::SearchController(
         profile_, model->search_box(), model->results(), controller_.get()));
 
     signin_delegate_.reset(new ChromeSigninDelegate(profile_));
-
 #if defined(USE_ASH)
     app_sync_ui_state_watcher_.reset(new AppSyncUIStateWatcher(profile_,
-                                                               model));
+                                                               model_));

[tapted, 2013/07/31 05:43:53]

`model_` with an underscore might be an error?

[calamity, 2013/08/01 08:35:45]

Done.

 #endif
   } else {

[tapted, 2013/07/31 05:43:53]

Does something need to be done for the `else` case. E.g. clear items && notify?

[calamity, 2013/08/01 08:35:45]

I removed the else case because it doesn't seem to be used anywhere...

     apps_builder_.reset();
     search_controller_.reset();
 #if defined(USE_ASH)
     app_sync_ui_state_watcher_.reset();
 #endif
   }
 }
 
 app_list::SigninDelegate* AppListViewDelegate::GetSigninDelegate() {
   return signin_delegate_.get();
@@ skipping 65 matching lines @@
 }
 
 void AppListViewDelegate::ViewActivationChanged(bool active) {
   controller_->ViewActivationChanged(active);
 }
 
 gfx::ImageSkia AppListViewDelegate::GetWindowIcon() {
   return controller_->GetWindowIcon();
 }
 
-string16 AppListViewDelegate::GetCurrentUserName() {
-  ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
-  size_t profile_index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
-  if (profile_index != std::string::npos)
-    return cache.GetNameOfProfileAtIndex(profile_index);
-
-  return string16();
-}
-
-string16 AppListViewDelegate::GetCurrentUserEmail()  {
-  ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
-  size_t profile_index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
-  if (profile_index != std::string::npos)
-    return cache.GetUserNameOfProfileAtIndex(profile_index);
-
-  return string16();
-}
-
 void AppListViewDelegate::OpenSettings() {
   ExtensionService* service = profile_->GetExtensionService();
   DCHECK(service);
   const extensions::Extension* extension = service->GetInstalledExtension(
       extension_misc::kSettingsAppId);
   DCHECK(extension);
   controller_->ActivateApp(profile_, extension, 0);
 }
 
 void AppListViewDelegate::OpenHelp() {
   chrome::HostDesktopType desktop = chrome::GetHostDesktopTypeForNativeWindow(
       controller_->GetAppListWindow());
   Browser* browser = chrome::FindOrCreateTabbedBrowser(
       profile_, desktop);
   browser->OpenURL(content::OpenURLParams(GURL(chrome::kAppLauncherHelpURL),
                                           content::Referrer(),
                                           NEW_FOREGROUND_TAB,
                                           content::PAGE_TRANSITION_LINK,
                                           false));
 }
 
 void AppListViewDelegate::OpenFeedback() {
   chrome::HostDesktopType desktop = chrome::GetHostDesktopTypeForNativeWindow(
       controller_->GetAppListWindow());
   Browser* browser = chrome::FindOrCreateTabbedBrowser(
       profile_, desktop);
   chrome::ShowFeedbackPage(browser, std::string(),
                            chrome::kAppLauncherCategoryTag);
 }
+
+void AppListViewDelegate::ShowForProfileAtIndex(size_t index) {
+  controller_->ShowForProfileAtIndex(index);
+}
+
+void AppListViewDelegate::RebuildAvatarMenuItems(
+    app_list::AppListModel* model) {
+  ProfileInfoCache& cache =
+      g_browser_process->profile_manager()->GetProfileInfoCache();
+  STLDeleteElements(&model->avatar_menu_items());

[tapted, 2013/07/31 05:43:53]

it's a bit odd to expose a non-const reference to a data member this way.. I'd
prefer a local vector to be populated, which is then passed to a setter, like

AppListMode::SetMenuItems(const std::vector<..>& new_items) {
  STLDeleteElements(avatar_menu_items_);
  avatar_menu_items_ = new_items;
}

An efficient alternative might be the following, but I think the above is more
Chromey.

AppListMode::SetMenuItems(std::vector<..>* new_items) {
  new_items->swap(avatar_menu_items_);
  STLDeleteElements(*new_items);
}

[calamity, 2013/08/01 08:35:45]

Done.

+  profiles::PopulateAvatarMenuItemModels(model->avatar_menu_items(),
+                                         &cache,
+                                         base::FilePath());
+}