Revert of Refactor the avatar button/icon class

chrome/browser/ui/views/profiles/avatar_menu_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_AVATAR_MENU_BUTTON_H_
 #define CHROME_BROWSER_UI_VIEWS_PROFILES_AVATAR_MENU_BUTTON_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "chrome/browser/ui/views/profiles/avatar_base_button.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/view_targeter_delegate.h"
 
 namespace gfx {
 class Canvas;
 class Image;
 }
 class Browser;
 class Profile;
 
 // AvatarMenuButton
 //
 // A button used to show either the incognito avatar or the profile avatar.
 // The button can optionally have a menu attached to it.
 
-class AvatarMenuButton : public AvatarBaseButton,
-                         public views::MenuButton,
+class AvatarMenuButton : public views::MenuButton,
                          public views::MenuButtonListener,
                          public views::ViewTargeterDelegate {
  public:
   // Internal class name.
   static const char kViewClassName[];
 
   // Creates a new button. Unless |disabled| is true, clicking on the button
   // will cause the profile menu to be displayed.
   AvatarMenuButton(Browser* browser, bool disabled);
 
@@ skipping 15 matching lines @@
   // Get avatar images for the profile.  |avatar| is used in the browser window
   // whereas |taskbar_badge_avatar| is used for the OS taskbar.  If
   // |taskbar_badge_avatar| is empty then |avatar| should be used for the
   // taskbar as well. Returns false if the cache doesn't have an entry for a
   // Profile::REGULAR_PROFILE type |profile|, otherwise return true.
   static bool GetAvatarImages(Profile* profile,
                               bool should_show_avatar_menu,
                               gfx::Image* avatar,
                               gfx::Image* taskbar_badge_avatar,
                               bool* is_rectangle);
- protected:
-  // AvatarBaseButton:
-  void Update() override;
 
  private:
   // views::ViewTargeterDelegate:
   bool DoesIntersectRect(const views::View* target,
                          const gfx::Rect& rect) const override;
 
   // views::MenuButtonListener:
   void OnMenuButtonClicked(views::View* source,
                            const gfx::Point& point) override;
 
+  Browser* browser_;
   bool disabled_;
   scoped_ptr<ui::MenuModel> menu_model_;
 
   // Use a scoped ptr because gfx::Image doesn't have a default constructor.
   scoped_ptr<gfx::Image> icon_;
   gfx::ImageSkia button_icon_;
   bool is_rectangle_;
   int old_height_;
   // True if the avatar button is on the right side of the browser window.
   bool button_on_right_;
 
   DISALLOW_COPY_AND_ASSIGN(AvatarMenuButton);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PROFILES_AVATAR_MENU_BUTTON_H_