[Profiles] Remove the NotificationService from the ProfileInfoCache

chrome/browser/ui/views/frame/browser_non_client_frame_view.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_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
 
 #include "chrome/browser/ui/views/profiles/new_avatar_button.h"
 #include "ui/views/window/non_client_view.h"
 
@@ skipping 48 matching lines @@
   // Returns the location icon, if this frame has any.
   virtual views::View* GetLocationIconView() const;
 
   // Overriden from views::View.
   void VisibilityChanged(views::View* starting_from, bool is_visible) override;
 
  protected:
   BrowserView* browser_view() const { return browser_view_; }
   BrowserFrame* frame() const { return frame_; }
 
-  // Updates the title and icon of the avatar button.
+  // Updates the avatar button using the old or new UI based on the BrowserView
+  // type, and the presence of the --enable-new-avatar-menu flag. Calls either
+  // UpdateAvatarInfo() or UpdateNewStyleAvatar() accordingly.
+  void UpdateAvatar();
+
+  // Updates the title and icon of the old avatar button.
   void UpdateAvatarInfo();
 
+  // Updates the avatar button displayed in the caption area by calling
+  // UpdateNewStyleAvatarInfo() with an implementation specific |listener|
+  // and button |style|.
+  virtual void UpdateNewStyleAvatar() = 0;
+
   // Updates the title of the avatar button displayed in the caption area.
   // The button uses |style| to match the browser window style and notifies
   // |listener| when it is clicked.
   void UpdateNewStyleAvatarInfo(views::ButtonListener* listener,
                                 const NewAvatarButton::AvatarButtonStyle style);
 
  private:
-  // Draws a taskbar icon if avatar are enabled, erases it otherwise.  If
-  // |taskbar_badge_avatar| is null, then |avatar| is used.
-  void DrawTaskbarDecoration(const gfx::Image& avatar,
-                             const gfx::Image& taskbar_badge_avatar);
-
   // Overriden from ProfileInfoCacheObserver.
   void OnProfileAdded(const base::FilePath& profile_path) override;
   void OnProfileWasRemoved(const base::FilePath& profile_path,
                            const base::string16& profile_name) override;
   void OnProfileAvatarChanged(const base::FilePath& profile_path) override;
+  void OnProfileNameChanged(const base::FilePath& profile_path,
+                            const base::string16& old_profile_name) override;
+
+  // Draws a taskbar icon if avatars are enabled, erases it otherwise.
+  void UpdateTaskbarDecoration();
 
   // The frame that hosts this view.
   BrowserFrame* frame_;
 
   // The BrowserView hosted within this View.
   BrowserView* browser_view_;
 
   // Menu button that displays that either the incognito icon or the profile
   // icon.  May be null for some frame styles.
   AvatarMenuButton* avatar_button_;
 
 #if defined(ENABLE_SUPERVISED_USERS)
   SupervisedUserAvatarLabel* supervised_user_avatar_label_;
 #endif
 
   // Menu button that displays the name of the active or guest profile.
   // May be null and will not be displayed for off the record profiles.
   NewAvatarButton* new_avatar_button_;
 };
 
 namespace chrome {
 
 // Provided by a browser_non_client_frame_view_factory_*.cc implementation
 BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
     BrowserFrame* frame, BrowserView* browser_view);
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_