Change profile menu button to avatar button

views/controls/button/text_button.cc

Index: views/controls/button/text_button.cc
===================================================================
--- views/controls/button/text_button.cc	(revision 88024)
+++ views/controls/button/text_button.cc	(working copy)
@@ -679,13 +679,7 @@
 void TextButton::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
   TextButtonBase::PaintButton(canvas, mode);
 
-  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_;
-  }
+  SkBitmap icon = GetImageToPaint();
 
   if (icon.width() > 0) {
     gfx::Rect text_bounds = GetTextBounds();
@@ -753,4 +747,14 @@
   return bounds;
 }
 
+SkBitmap TextButton::GetImageToPaint() const {
+  if (show_multiple_icon_states_) {
+    if (has_hover_icon_ && (state() == BS_HOT))
+      return icon_hover_;
+    else if (has_pushed_icon_ && (state() == BS_PUSHED))

[Peter Kasting, 2011/06/09 18:03:31]

Nit: No else after return

[sail, 2011/06/10 00:56:20]

Done.

+      return icon_pushed_;
+  }
+  return icon_;
+}
+
 }  // namespace views