Revert 88683 - Change profile menu button to avatar button

views/controls/button/text_button.cc

 // Copyright (c) 2011 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 "views/controls/button/text_button.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 635 matching lines @@
 
   if (max_width_ > 0)
     prefsize.set_width(std::min(max_width_, prefsize.width()));
 
   return prefsize;
 }
 
 void TextButton::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
   TextButtonBase::PaintButton(canvas, mode);
 
-  const SkBitmap& icon = GetImageToPaint();
+  SkBitmap icon = icon_;
+  if (show_multiple_icon_states_) {
+    if (has_hover_icon_ && (state() == BS_HOT))
+      icon = icon_hover_;
+    else if (has_pushed_icon_ && (state() == BS_PUSHED))
+      icon = icon_pushed_;
+  }
 
   if (icon.width() > 0) {
     gfx::Rect text_bounds = GetTextBounds();
     int icon_x;
     int spacing = text_.empty() ? 0 : icon_text_spacing_;
     if (icon_placement_ == ICON_ON_LEFT) {
       icon_x = text_bounds.x() - icon.width() - spacing;
     } else {
       icon_x = text_bounds.right() + spacing;
     }
@@ skipping 22 matching lines @@
   params->button.indeterminate = false;
   params->button.is_default = is_default_;
   params->button.has_border = false;
   params->button.classic_state = 0;
   params->button.background_color = kEnabledColor;
 }
 
 gfx::Rect TextButton::GetTextBounds() const {
   int extra_width = 0;
 
-  const SkBitmap& icon = GetImageToPaint();
+  SkBitmap icon = icon_;
+  if (show_multiple_icon_states_) {
+    if (has_hover_icon_ && (state() == BS_HOT))
+      icon = icon_hover_;
+    else if (has_pushed_icon_ && (state() == BS_PUSHED))
+      icon = icon_pushed_;
+  }
+
   if (icon.width() > 0)
     extra_width = icon.width() + (text_.empty() ? 0 : icon_text_spacing_);
 
   gfx::Rect bounds(GetContentBounds(extra_width));
 
   if (extra_width > 0) {
     // Make sure the icon is always fully visible.
     if (icon_placement_ == ICON_ON_LEFT) {
       bounds.Inset(extra_width, 0, 0, 0);
     } else {
       bounds.Inset(0, 0, extra_width, 0);
     }
   }
 
   return bounds;
 }
 
-const SkBitmap& TextButton::GetImageToPaint() const {
-  if (show_multiple_icon_states_) {
-    if (has_hover_icon_ && (state() == BS_HOT))
-      return icon_hover_;
-    if (has_pushed_icon_ && (state() == BS_PUSHED))
-      return icon_pushed_;
-  }
-  return icon_;
-}
-
 }  // namespace views