Move signin status and current user information into AppListModel.

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 "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"
 #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/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"
 
 #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
@@ skipping 11 matching lines @@
       base::Bind(web_app::CreateShortcutInWebAppDir, app_data_dir, info),
       callback);
 }
 #endif
 
 }  // namespace
 
 AppListViewDelegate::AppListViewDelegate(AppListControllerDelegate* controller,
                                          Profile* profile)
     : controller_(controller),
-      profile_(profile) {}
+      profile_(profile),
+      model_(NULL) {
+  RegisterForNotifications();
+}
 
-AppListViewDelegate::~AppListViewDelegate() {}
+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.

+}
+
+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()));
     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(new AppSyncUIStateWatcher(profile_,
                                                                model));
 #endif
+    UpdateModelWithCurrentProfiles();
   } else {
+    model_ = NULL;
     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::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();
+}