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"

[tapted, 2013/08/14 03:53:11]

nit: content::NotificationSource and content::NotificationDetails look like they
can just be forward-decs (probably in the header file, since they're used there
first).

[calamity, 2013/08/14 09:19:00]

Done. notification_source.h is needed for content::Source.

+#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) {
+  DCHECK(profile_);
+  registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,

[tfarina, 2013/08/14 03:57:00]

do you need to use notifications? we are moving away from it. see recent thread
on chromium-dev about this.

[calamity, 2013/08/14 09:19:00]

I'll split out the NOTIFICATION_PROFILE_CACHED_INFO_CHANGED change into another
CL since it's actually an orthogonal issue anyway, and use
ProfileInfoCacheObserver there.

After looking at this again, it looks like the other signin notifications are
still needed here. There's no observer equivalent for these events.

+                 content::NotificationService::AllSources());
+  registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_SIGNED_OUT,
+                 content::Source<Profile>(profile_));
+}
 
-AppListViewDelegate::~AppListViewDelegate() {}
+AppListViewDelegate::~AppListViewDelegate() {
+  if (signin_delegate_.get())

[tapted, 2013/08/14 03:53:11]

nit: the `.get()` is usually dropped when used as a condition. Another in
SetModel.

[calamity, 2013/08/14 09:19:00]

Done.

+    signin_delegate_->RemoveObserver(this);
+}
+
+void AppListViewDelegate::OnProfileChanged() {
+  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;
+
+  model_->SetCurrentUser(cache.GetNameOfProfileAtIndex(profile_index),
+                         cache.GetUserNameOfProfileAtIndex(profile_index));
+}
 
 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
+    OnProfileChanged();
   } else {

[tapted, 2013/08/14 03:53:11]

I think while this else is still around, it also needs a
signin_delegate_.reset()

[calamity, 2013/08/14 09:19:00]

Done.

+    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::OnSigninSuccess() {
+  OnProfileChanged();
+}
+
+void AppListViewDelegate::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
+  OnProfileChanged();
+}