Add profile selector menu to app list.

chrome/browser/ui/app_list/app_list_view_delegate.cc

Index: chrome/browser/ui/app_list/app_list_view_delegate.cc
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.cc b/chrome/browser/ui/app_list/app_list_view_delegate.cc
index ee4769fc650c333695c975dc3b291ad0fd8c40c5..7aa0d96ea83ec1c856fa054c13ec8ed4cdb64e37 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.cc
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc
@@ -6,9 +6,13 @@
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
+#include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/chrome_notification_types.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"
@@ -23,8 +27,13 @@
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/notification_details.h"
+#include "content/public/browser/notification_service.h"
+#include "content/public/browser/notification_source.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/user_metrics.h"
+#include "ui/app_list/search_box_model.h"
+#include "ui/base/profile_selector/avatar_menu_item_model.h"
 
 #if defined(USE_ASH)
 #include "chrome/browser/ui/ash/app_list/app_sync_ui_state_watcher.h"
@@ -54,33 +63,79 @@ void CreateShortcutInWebAppDir(
 AppListViewDelegate::AppListViewDelegate(AppListControllerDelegate* controller,
                                          Profile* profile)
     : controller_(controller),
-      profile_(profile) {}
+      profile_(profile),
+      model_(NULL) {
+  RegisterForNotifications();
+}
+
+AppListViewDelegate::~AppListViewDelegate() {
+  signin_delegate_->RemoveObserver(this);
+}
+
+void AppListViewDelegate::RegisterForNotifications() {
+  DCHECK(profile_);
+  registrar_.RemoveAll();
+  registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
+                 content::NotificationService::AllSources());
+  registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
+                 content::Source<Profile>(profile_));
+  registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED,
+                 content::Source<Profile>(profile_));
+  registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_SIGNED_OUT,
+                 content::Source<Profile>(profile_));
+}
 
-AppListViewDelegate::~AppListViewDelegate() {}
+void AppListViewDelegate::SetProfileByPath(const base::FilePath& profile_path) {
+  DCHECK(model_);
 
-void AppListViewDelegate::SetModel(app_list::AppListModel* model) {
-  if (model) {
-    apps_builder_.reset(new AppsModelBuilder(profile_,
-                                             model->apps(),
-                                             controller_.get()));
-    apps_builder_->Build();
+  // The profile must be loaded before this is called.
+  profile_ =
+      g_browser_process->profile_manager()->GetProfileByPath(profile_path);
+  DCHECK(profile_);
 
-    search_controller_.reset(new app_list::SearchController(
-        profile_, model->search_box(), model->results(), controller_.get()));
+  RegisterForNotifications();
 
-    signin_delegate_.reset(new ChromeSigninDelegate(profile_));
+  apps_builder_->SetProfile(profile_);
+
+  search_controller_.reset(new app_list::SearchController(
+      profile_, model_->search_box(), model_->results(), controller_.get()));
+
+  signin_delegate_->SetProfileByPath(profile_path);
 
 #if defined(USE_ASH)
-    app_sync_ui_state_watcher_.reset(new AppSyncUIStateWatcher(profile_,
-                                                               model));
+  app_sync_ui_state_watcher_.reset(new AppSyncUIStateWatcher(profile_,
+                                                             model_));
 #endif
-  } else {
-    apps_builder_.reset();
-    search_controller_.reset();
+
+  UpdateModelWithCurrentProfiles();
+
+  if (!model_->search_box()->text().empty())
+    StartSearch();
+}
+
+void AppListViewDelegate::InitModel(app_list::AppListModel* model) {
+  DCHECK(!model_);
+  DCHECK(model);
+  model_ = 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_));
+  signin_delegate_->AddObserver(this);
+
 #if defined(USE_ASH)
-    app_sync_ui_state_watcher_.reset();
+  app_sync_ui_state_watcher_.reset(new AppSyncUIStateWatcher(profile_,
+                                                             model));
 #endif
-  }
+  // Initialize the profile information in the app list menu.
+  UpdateModelWithCurrentProfiles();
 }
 
 app_list::SigninDelegate* AppListViewDelegate::GetSigninDelegate() {
@@ -160,26 +215,6 @@ 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);
@@ -209,3 +244,40 @@ void AppListViewDelegate::OpenFeedback() {
   chrome::ShowFeedbackPage(browser, std::string(),
                            chrome::kAppLauncherCategoryTag);
 }
+
+void AppListViewDelegate::ShowForProfileByPath(
+    const base::FilePath& profile_path) {
+  controller_->ShowForProfileByPath(profile_path);
+}
+
+void AppListViewDelegate::UpdateModelWithCurrentProfiles() {
+  model_->SetSignedIn(!signin_delegate_->NeedSignin());
+  ProfileInfoCache& cache =
+      g_browser_process->profile_manager()->GetProfileInfoCache();
+  // Populate the current user details.
+  size_t profile_index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
+  // The profile won't exist in the cache if the current app list profile is
+  // being deleted.
+  if (profile_index == std::string::npos)
+    return;

[tapted, 2013/08/05 03:01:39]

nit: blank line after early return

[calamity, 2013/08/08 04:52:12]

Done.

+  model_->SetCurrentUser(cache.GetNameOfProfileAtIndex(profile_index),
+                         cache.GetUserNameOfProfileAtIndex(profile_index));
+
+  // Populate the profile menu items;

[tapted, 2013/08/05 03:01:39]

semicolon should be a .

[calamity, 2013/08/08 04:52:12]

Done.

+  app_list::AppListModel::ProfileMenuItems profile_menu_items;
+  profiles::PopulateAvatarMenuItemModels(&cache,
+                                         base::FilePath(),
+                                         &profile_menu_items);
+  model_->SetProfileMenuItems(profile_menu_items);
+}
+
+void AppListViewDelegate::OnSigninSuccess() {
+  UpdateModelWithCurrentProfiles();
+}
+
+void AppListViewDelegate::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
+  UpdateModelWithCurrentProfiles();
+}