Revert of Refactor the avatar button/icon class

chrome/browser/ui/views/profiles/new_avatar_button.h

 // Copyright 2014 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_PROFILES_NEW_AVATAR_BUTTON_H_
 #define CHROME_BROWSER_UI_VIEWS_PROFILES_NEW_AVATAR_BUTTON_H_
 
-#include "chrome/browser/ui/views/profiles/avatar_base_button.h"
+#include "chrome/browser/profiles/profile_info_cache_observer.h"
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "ui/views/controls/button/label_button.h"
 
 class Browser;
 
 // Avatar button that displays the active profile's name in the caption area.
-class NewAvatarButton : public AvatarBaseButton,
-                        public views::LabelButton,
+class NewAvatarButton : public views::LabelButton,
+                        public ProfileInfoCacheObserver,
                         public SigninErrorController::Observer {
  public:
   // Different button styles that can be applied.
   enum AvatarButtonStyle {
     THEMED_BUTTON,   // Used in a themed browser window.
     NATIVE_BUTTON,    // Used in a native aero or metro window.
   };
 
   NewAvatarButton(views::ButtonListener* listener,
                   AvatarButtonStyle button_style,
                   Browser* browser);
   ~NewAvatarButton() override;
 
   // Views::LabelButton
   bool OnMousePressed(const ui::MouseEvent& event) override;
   void OnMouseReleased(const ui::MouseEvent& event) override;
 
- protected:
-  // AvatarBaseButton:
-  void Update() override;
-
  private:
   friend class ProfileChooserViewExtensionsTest;
 
+  // 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 OnProfileSupervisedUserIdChanged(
+      const base::FilePath& profile_path) override;
+
   // SigninErrorController::Observer:
   void OnErrorChanged() override;
 
+  // Called when the profile info cache has changed, which means we might
+  // have to update the icon/text of the button.
+  void Update();
+
+  Browser* browser_;
+
   // Whether the signed in profile has an authentication error. Used to display
   // an error icon next to the button text.
   bool has_auth_error_;
 
   // The icon displayed instead of the profile name in the local profile case.
   // Different assets are used depending on the OS version.
   gfx::ImageSkia generic_avatar_;
 
   // This is used to check if the bubble was showing during the mouse pressed
   // event. If this is true then the mouse released event is ignored to prevent
   // the bubble from reshowing.
   bool suppress_mouse_released_action_;
 
   DISALLOW_COPY_AND_ASSIGN(NewAvatarButton);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PROFILES_NEW_AVATAR_BUTTON_H_