Revert of Refactor the avatar button/icon class

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

 // 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.
 
 #include "chrome/browser/ui/views/profiles/new_avatar_button.h"
 
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
@@ skipping 28 matching lines @@
                                  kBottomInset, kLeftRightInset));
 
   return border.Pass();
 }
 
 }  // namespace
 
 NewAvatarButton::NewAvatarButton(views::ButtonListener* listener,
                                  AvatarButtonStyle button_style,
                                  Browser* browser)
-    : AvatarBaseButton(browser),
-      LabelButton(listener, base::string16()),
+    : LabelButton(listener, base::string16()),
+      browser_(browser),
       has_auth_error_(false),
       suppress_mouse_released_action_(false) {
   set_triggerable_event_flags(
       ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON);
   set_animate_on_state_change(false);
   SetTextColor(views::Button::STATE_NORMAL, SK_ColorWHITE);
   SetTextColor(views::Button::STATE_HOVERED, SK_ColorWHITE);
   SetTextColor(views::Button::STATE_PRESSED, SK_ColorWHITE);
   SetTextSubpixelRenderingEnabled(false);
   SetHorizontalAlignment(gfx::ALIGN_CENTER);
@@ skipping 27 matching lines @@
   } else {
     const int kNormalImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_NORMAL);
     const int kHotImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_HOVER);
     const int kPushedImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_PRESSED);
 
     SetBorder(CreateBorder(kNormalImageSet, kHotImageSet, kPushedImageSet));
     generic_avatar_ =
         *rb->GetImageNamed(IDR_AVATAR_GLASS_BUTTON_AVATAR).ToImageSkia();
   }
 
+  g_browser_process->profile_manager()->GetProfileInfoCache().AddObserver(this);
+
   // Subscribe to authentication error changes so that the avatar button can
   // update itself.  Note that guest mode profiles won't have a token service.
   SigninErrorController* error =
-      profiles::GetSigninErrorController(browser->profile());
+      profiles::GetSigninErrorController(browser_->profile());
   if (error) {
     error->AddObserver(this);
     OnErrorChanged();  // This calls Update().
   } else {
     Update();
   }
   SchedulePaint();
 }
 
 NewAvatarButton::~NewAvatarButton() {
+  g_browser_process->profile_manager()->
+      GetProfileInfoCache().RemoveObserver(this);
   SigninErrorController* error =
-      profiles::GetSigninErrorController(browser()->profile());
+      profiles::GetSigninErrorController(browser_->profile());
   if (error)
     error->RemoveObserver(this);
 }
 
 bool NewAvatarButton::OnMousePressed(const ui::MouseEvent& event) {
   // Prevent the bubble from being re-shown if it's already showing.
   suppress_mouse_released_action_ = ProfileChooserView::IsShowing();
   return LabelButton::OnMousePressed(event);
 }
 
 void NewAvatarButton::OnMouseReleased(const ui::MouseEvent& event) {
   if (suppress_mouse_released_action_)
     suppress_mouse_released_action_ = false;
   else
     LabelButton::OnMouseReleased(event);
 }
 
+void NewAvatarButton::OnProfileAdded(const base::FilePath& profile_path) {
+  Update();
+}
+
+void NewAvatarButton::OnProfileWasRemoved(
+      const base::FilePath& profile_path,
+      const base::string16& profile_name) {
+  // If deleting the active profile, don't bother updating the avatar
+  // button, as the browser window is being closed anyway.
+  if (browser_->profile()->GetPath() != profile_path)
+    Update();
+}
+
+void NewAvatarButton::OnProfileNameChanged(
+      const base::FilePath& profile_path,
+      const base::string16& old_profile_name) {
+  if (browser_->profile()->GetPath() == profile_path)
+    Update();
+}
+
+void NewAvatarButton::OnProfileSupervisedUserIdChanged(
+      const base::FilePath& profile_path) {
+  if (browser_->profile()->GetPath() == profile_path)
+    Update();
+}
+
+void NewAvatarButton::OnErrorChanged() {
+  // If there is an error, show an warning icon.
+  const SigninErrorController* error =
+      profiles::GetSigninErrorController(browser_->profile());
+  has_auth_error_ = error && error->HasError();
+
+  Update();
+}
+
 void NewAvatarButton::Update() {
   const ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
 
   // If we have a single local profile, then use the generic avatar
   // button instead of the profile name. Never use the generic button if
   // the active profile is Guest.
-  bool use_generic_button = (!browser()->profile()->IsGuestSession() &&
+  bool use_generic_button = (!browser_->profile()->IsGuestSession() &&
                              cache.GetNumberOfProfiles() == 1 &&
                              cache.GetUserNameOfProfileAtIndex(0).empty());
 
   SetText(use_generic_button ? base::string16() :
-      profiles::GetAvatarButtonTextForProfile(browser()->profile()));
+      profiles::GetAvatarButtonTextForProfile(browser_->profile()));
 
   // If the button has no text, clear the text shadows to make sure the
   // image is centered correctly.
   SetTextShadows(
       use_generic_button
           ? gfx::ShadowValues()
           : gfx::ShadowValues(
                 10, gfx::ShadowValue(gfx::Vector2d(), 1.0f, SK_ColorDKGRAY)));
 
   // We want the button to resize if the new text is shorter.
   SetMinSize(gfx::Size());
 
   if (use_generic_button) {
     SetImage(views::Button::STATE_NORMAL, generic_avatar_);
   } else if (has_auth_error_) {
     SetImage(views::Button::STATE_NORMAL,
              *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
                   IDR_ICON_PROFILES_AVATAR_BUTTON_ERROR).ToImageSkia());
   } else {
     SetImage(views::Button::STATE_NORMAL, gfx::ImageSkia());
   }
 
   // If we are not using the generic button, then reset the spacing between
   // the text and the possible authentication error icon.
   const int kDefaultImageTextSpacing = 5;
   SetImageLabelSpacing(use_generic_button ? 0 : kDefaultImageTextSpacing);
 
   PreferredSizeChanged();
 }
-
-void NewAvatarButton::OnErrorChanged() {
-  // If there is an error, show a warning.
-  const SigninErrorController* error =
-      profiles::GetSigninErrorController(browser()->profile());
-  has_auth_error_ = error && error->HasError();
-
-  Update();
-}