[Profiles] Remove the NotificationService from the ProfileInfoCache

chrome/browser/profiles/avatar_menu.h

 // 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.
 
 #ifndef CHROME_BROWSER_PROFILES_AVATAR_MENU_H_
 #define CHROME_BROWSER_PROFILES_AVATAR_MENU_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
+#include "chrome/browser/profiles/profile_info_cache_observer.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/ui/host_desktop.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ui/gfx/image/image.h"
 
 #if defined(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/supervised_user/supervised_user_service_observer.h"
 #endif
 
 class AvatarMenuActions;
 class AvatarMenuObserver;
 class Browser;
 class Profile;
 class ProfileInfoInterface;
 class ProfileList;
 class SupervisedUserService;
 
 // This class represents the menu-like interface used to select profiles,
 // such as the bubble that appears when the avatar icon is clicked in the
 // browser window frame. This class will notify its observer when the backend
 // data changes, and the view for this model should forward actions
 // back to it in response to user events.
 class AvatarMenu :
 #if defined(ENABLE_SUPERVISED_USERS)
     public SupervisedUserServiceObserver,
 #endif
-    public content::NotificationObserver {
+    public ProfileInfoCacheObserver {
  public:
   // Represents an item in the menu.
   struct Item {
     Item(size_t menu_index, size_t profile_index, const gfx::Image& icon);
     ~Item();
 
     // The icon to be displayed next to the item.
     gfx::Image icon;
 
     // Whether or not the current browser is using this profile.
@@ skipping 85 matching lines @@
   // This menu is also used for the always-present Mac system menubar. If the
   // last active browser changes, the menu will need to reference that browser.
   void ActiveBrowserChanged(Browser* browser);
 
   // Returns true if the add profile link should be shown.
   bool ShouldShowAddNewProfileLink() const;
 
   // Returns true if the edit profile link should be shown.
   bool ShouldShowEditProfileLink() const;
 
-  // content::NotificationObserver:
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
+ private:
+  // ProfileInfoCacheObserver:
+  void OnProfileAdded(const base::FilePath& profile_path) override;
+  void OnProfileWasRemoved(const base::FilePath& profile_path,
+      const base::string16& profile_name) override;
+  void OnProfileNameChanged(const base::FilePath& profile_path,
+      const base::string16& old_profile_name) override;
+  void OnProfileUserNameChanged(const base::FilePath& profile_path) override;
+  void OnProfileAvatarChanged(const base::FilePath& profile_path) override;
+  void OnProfileHighResAvatarLoaded(
+      const base::FilePath& profile_path) override;
+  void OnProfileSigninRequiredChanged(
+      const base::FilePath& profile_path) override;
 
- private:
 #if defined(ENABLE_SUPERVISED_USERS)
   // SupervisedUserServiceObserver:
   void OnCustodianInfoChanged() override;
 #endif
 
+  // Rebuilds the menu and notifies any observers that an update occured.
+  void Update();
+
   // The model that provides the list of menu items.
   scoped_ptr<ProfileList> profile_list_;
 
   // The controller for avatar menu actions.
   scoped_ptr<AvatarMenuActions> menu_actions_;
 
 #if defined(ENABLE_SUPERVISED_USERS)
   // Observes changes to a supervised user's custodian info.
   ScopedObserver<SupervisedUserService, SupervisedUserServiceObserver>
       supervised_user_observer_;
 #endif
 
   // The cache that provides the profile information. Weak.
   ProfileInfoInterface* profile_info_;
 
   // The observer of this model, which is notified of changes. Weak.
   AvatarMenuObserver* observer_;
 
   // Browser in which this avatar menu resides. Weak.
   Browser* browser_;
 
-  // Listens for notifications from the ProfileInfoCache.
-  content::NotificationRegistrar registrar_;
-
   DISALLOW_COPY_AND_ASSIGN(AvatarMenu);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_AVATAR_MENU_H_