Move signin status and current user information into AppListModel.

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..9ebb720d301be5adcda2999b9cf54337301c190f 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.cc
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc
@@ -7,6 +7,7 @@
 #include "base/callback.h"
 #include "base/files/file_path.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_manager.h"
@@ -23,6 +24,9 @@
 #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"
 
@@ -54,12 +58,33 @@ void CreateShortcutInWebAppDir(
 AppListViewDelegate::AppListViewDelegate(AppListControllerDelegate* controller,
                                          Profile* profile)
     : controller_(controller),
-      profile_(profile) {}
+      profile_(profile),
+      model_(NULL) {
+  RegisterForNotifications();
+}
+
+AppListViewDelegate::~AppListViewDelegate() {
+  signin_delegate_->RemoveObserver(this);

[tapted, 2013/08/06 09:27:50]

SetModel has a check: `if (signin_delegate_.get())`. Is that needed here as
well?

[calamity, 2013/08/08 01:34:58]

Done.

+}
 
-AppListViewDelegate::~AppListViewDelegate() {}
+void AppListViewDelegate::RegisterForNotifications() {
+  DCHECK(profile_);
+  registrar_.RemoveAll();

[tapted, 2013/08/06 09:27:50]

It looks like this (private function) is only called from the constructor, so
this line is not needed. And, in the current form, it looks like the rest can
just go inline in the constructor, which is the typical pattern for registrar_
foo

[calamity, 2013/08/08 01:34:58]

Done.

+  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_));
+}
 
 void AppListViewDelegate::SetModel(app_list::AppListModel* model) {
+  if (signin_delegate_.get())
+    signin_delegate_->RemoveObserver(this);
   if (model) {
+    model_ = model;
     apps_builder_.reset(new AppsModelBuilder(profile_,
                                              model->apps(),
                                              controller_.get()));
@@ -69,12 +94,15 @@ void AppListViewDelegate::SetModel(app_list::AppListModel* model) {
         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(new AppSyncUIStateWatcher(profile_,
                                                                model));
 #endif
+    UpdateModelWithCurrentProfiles();
   } else {
+    model_ = NULL;
     apps_builder_.reset();
     search_controller_.reset();
 #if defined(USE_ASH)
@@ -160,26 +188,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 +217,28 @@ void AppListViewDelegate::OpenFeedback() {
   chrome::ShowFeedbackPage(browser, std::string(),
                            chrome::kAppLauncherCategoryTag);
 }
+
+void AppListViewDelegate::UpdateModelWithCurrentProfiles() {

[koz (OOO until 15th September), 2013/08/06 08:14:42]

I think this would be better named OnProfileChanged().

[tapted, 2013/08/06 09:27:50]

nit: it's usually best to follow declaration order -- i.e. put this function up
around line 82.

[calamity, 2013/08/08 01:34:58]

Done.

[calamity, 2013/08/08 01:34:58]

Done.

+  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/06 09:27:50]

nit: blank line after early return

[calamity, 2013/08/08 01:34:58]

Done.

+  model_->SetCurrentUser(cache.GetNameOfProfileAtIndex(profile_index),
+                         cache.GetUserNameOfProfileAtIndex(profile_index));
+}
+
+void AppListViewDelegate::OnSigninSuccess() {
+  UpdateModelWithCurrentProfiles();
+}
+
+void AppListViewDelegate::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
+  UpdateModelWithCurrentProfiles();
+}