Revert 111018 - Rebase AvatarMenuBubbleView on the new views bubble.

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 111023)
+++ chrome/browser/ui/views/avatar_menu_button.h	(working copy)
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/compiler_specific.h"
+#include "chrome/browser/ui/views/bubble/bubble.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/view_menu_delegate.h"
@@ -24,7 +25,8 @@
 // The button can optionally have a menu attached to it.
 
 class AvatarMenuButton : public views::MenuButton,
-                         public views::ViewMenuDelegate {
+                         public views::ViewMenuDelegate,
+                         public Bubble::Observer {
  public:
   // Creates a new button. If |has_menu| is true then clicking on the button
   // will cause the profile menu to be displayed.
@@ -45,7 +47,11 @@
   // views::ViewMenuDelegate
   virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE;
 
+  // Bubble::Observer implementation.
+  virtual void OnBubbleClosing();
+
   Browser* browser_;
+  Bubble* bubble_;
   bool has_menu_;
   bool set_taskbar_decoration_;
   scoped_ptr<ui::MenuModel> menu_model_;