Revert 112171 - Views: Custom drawing for GAIA avatar pictures

chrome/browser/ui/views/avatar_menu_button.h

Index: chrome/browser/ui/views/avatar_menu_button.h
===================================================================
--- chrome/browser/ui/views/avatar_menu_button.h	(revision 112173)
+++ chrome/browser/ui/views/avatar_menu_button.h	(working copy)
@@ -15,7 +15,6 @@
 
 namespace gfx {
 class Canvas;
-class Image;
 }
 class Browser;
 
@@ -37,8 +36,8 @@
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual bool HitTest(const gfx::Point& point) const OVERRIDE;
 
-  virtual void SetIcon(const gfx::Image& icon,
-                       bool is_gaia_picture);
+  // views::TextButton
+  virtual void SetIcon(const SkBitmap& icon) OVERRIDE;
 
   void ShowAvatarBubble();
 
@@ -51,12 +50,6 @@
   bool set_taskbar_decoration_;
   scoped_ptr<ui::MenuModel> menu_model_;
 
-  // Use a scoped ptr because gfx::Image doesn't have a default constructor.
-  scoped_ptr<gfx::Image> icon_;
-  SkBitmap button_icon_;
-  bool is_gaia_picture_;
-  int old_height_;
-
   DISALLOW_COPY_AND_ASSIGN(AvatarMenuButton);
 };