[Profiles] Remove the NotificationService from the ProfileInfoCache

chrome/browser/notifications/message_center_settings_controller.cc

 // Copyright (c) 2013 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/notifications/message_center_settings_controller.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/string_compare.h"
@@ skipping 116 matching lines @@
   // rebuild the list when we get any of them.
   registrar_.Add(this,
                  chrome::NOTIFICATION_PROFILE_CREATED,
                  content::NotificationService::AllBrowserContextsAndSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_PROFILE_ADDED,
                  content::NotificationService::AllBrowserContextsAndSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_PROFILE_DESTROYED,
                  content::NotificationService::AllBrowserContextsAndSources());
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
-                 content::NotificationService::AllBrowserContextsAndSources());
-  RebuildNotifierGroups();
+  g_browser_process->profile_manager()->GetProfileInfoCache().AddObserver(this);
+  RebuildNotifierGroups(false);
 
 #if defined(OS_CHROMEOS)
   // UserManager may not exist in some tests.
   if (user_manager::UserManager::IsInitialized())
     user_manager::UserManager::Get()->AddSessionStateObserver(this);
 #endif
 }
 
 MessageCenterSettingsController::~MessageCenterSettingsController() {
+  g_browser_process->profile_manager()->
+      GetProfileInfoCache().RemoveObserver(this);
 #if defined(OS_CHROMEOS)
   // UserManager may not exist in some tests.
   if (user_manager::UserManager::IsInitialized())
     user_manager::UserManager::Get()->RemoveSessionStateObserver(this);
 #endif
 }
 
 void MessageCenterSettingsController::AddObserver(
     message_center::NotifierSettingsObserver* observer) {
   observers_.AddObserver(observer);
@@ skipping 236 matching lines @@
     const favicon_base::FaviconImageResult& favicon_result) {
   FOR_EACH_OBSERVER(message_center::NotifierSettingsObserver,
                     observers_,
                     UpdateIconImage(NotifierId(url), favicon_result.image));
 }
 
 
 #if defined(OS_CHROMEOS)
 void MessageCenterSettingsController::ActiveUserChanged(
     const user_manager::User* active_user) {
-  RebuildNotifierGroups();
+  RebuildNotifierGroups(false);
 }
 #endif
 
 void MessageCenterSettingsController::SetAppImage(const std::string& id,
                                                   const gfx::ImageSkia& image) {
   FOR_EACH_OBSERVER(message_center::NotifierSettingsObserver,
                     observers_,
                     UpdateIconImage(NotifierId(NotifierId::APPLICATION, id),
                                     gfx::Image(image)));
 }
 
 void MessageCenterSettingsController::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   // GetOffTheRecordProfile() may create a new off-the-record profile, but that
   // doesn't need to rebuild the groups.
   if (type == chrome::NOTIFICATION_PROFILE_CREATED &&
       content::Source<Profile>(source).ptr()->IsOffTheRecord()) {
     return;
   }
 
-  RebuildNotifierGroups();
-  FOR_EACH_OBSERVER(message_center::NotifierSettingsObserver,
-                    observers_,
-                    NotifierGroupChanged());
+  RebuildNotifierGroups(true);
+}
+
+void MessageCenterSettingsController::OnProfileAdded(
+    const base::FilePath& profile_path) {
+  RebuildNotifierGroups(true);
+}
+void MessageCenterSettingsController::OnProfileWasRemoved(
+    const base::FilePath& profile_path,
+    const base::string16& profile_name) {
+  RebuildNotifierGroups(true);
+}
+void MessageCenterSettingsController::OnProfileNameChanged(
+    const base::FilePath& profile_path,
+    const base::string16& old_profile_name) {
+  RebuildNotifierGroups(true);
+}
+void MessageCenterSettingsController::OnProfileUserNameChanged(
+    const base::FilePath& profile_path) {
+  RebuildNotifierGroups(true);
 }
 
 #if defined(OS_CHROMEOS)
 void MessageCenterSettingsController::CreateNotifierGroupForGuestLogin() {
   // Already created.
   if (!notifier_groups_.empty())
     return;
 
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   // |notifier_groups_| can be empty in login screen too.
@@ skipping 10 matching lines @@
                                                user->GetDisplayName(),
                                                0,
                                                profile));
 
   FOR_EACH_OBSERVER(message_center::NotifierSettingsObserver,
                     observers_,
                     NotifierGroupChanged());
 }
 #endif
 
-void MessageCenterSettingsController::RebuildNotifierGroups() {
+void MessageCenterSettingsController::RebuildNotifierGroups(bool notify) {
   notifier_groups_.clear();
   current_notifier_group_ = 0;
 
   const size_t count = profile_info_cache_->GetNumberOfProfiles();
-
   for (size_t i = 0; i < count; ++i) {
     scoped_ptr<message_center::ProfileNotifierGroup> group(
         new message_center::ProfileNotifierGroup(
             profile_info_cache_->GetAvatarIconOfProfileAtIndex(i),
             profile_info_cache_->GetNameOfProfileAtIndex(i),
             profile_info_cache_->GetUserNameOfProfileAtIndex(i),
             i,
             profile_info_cache_->GetPathOfProfileAtIndex(i)));
     if (group->profile() == NULL)
       continue;
@@ skipping 31 matching lines @@
     // registering it as the primary one, which causes this method which causes
     // another creating a primary profile, and causes an infinite loop.
     // Thus, it would be better to delay creating group for guest login.
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE,
         base::Bind(
             &MessageCenterSettingsController::CreateNotifierGroupForGuestLogin,
             weak_factory_.GetWeakPtr()));
   }
 #endif
+
+  if (notify) {
+    FOR_EACH_OBSERVER(message_center::NotifierSettingsObserver,
+                      observers_,
+                      NotifierGroupChanged());
+  }
 }