Revert 111018 - Rebase AvatarMenuBubbleView on the new views bubble.

chrome/browser/ui/views/avatar_menu_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 "chrome/browser/ui/views/avatar_menu_button.h"
 
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
@@ skipping 60 matching lines @@
   }
   taskbar->SetOverlayIcon(window, icon, L"");
   if (icon)
     DestroyIcon(icon);
 #endif
 }
 
 AvatarMenuButton::AvatarMenuButton(Browser* browser, bool has_menu)
     : MenuButton(NULL, string16(), this, false),
       browser_(browser),
+      bubble_(NULL),
       has_menu_(has_menu),
       set_taskbar_decoration_(false) {
   // In RTL mode, the avatar icon should be looking the opposite direction.
   EnableCanvasFlippingForRTLUI(true);
 }
 
 AvatarMenuButton::~AvatarMenuButton() {
+  if (bubble_)
+    OnBubbleClosing();
   // During destruction of the browser frame, we might not have a window
   // so the taskbar button will be removed by windows anyway.
   if (browser_->IsAttemptingToCloseBrowser())
     return;
   DrawTaskBarDecoration(browser_, NULL);
 }
 
 void AvatarMenuButton::OnPaint(gfx::Canvas* canvas) {
   const SkBitmap& icon = GetImageToPaint();
   if (icon.isNull())
@@ skipping 39 matching lines @@
   views::MenuButton::SetIcon(icon);
   set_taskbar_decoration_ = true;
 }
 
 // views::ViewMenuDelegate implementation
 void AvatarMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
   ShowAvatarBubble();
 }
 
 void AvatarMenuButton::ShowAvatarBubble() {
-  if (!has_menu_)
+  if (!has_menu_ || bubble_)
     return;
 
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_);
   gfx::Point origin;
   views::View::ConvertPointToScreen(this, &origin);
-  gfx::Rect bounds(origin, size());
+  gfx::Rect bounds(0, 0, width(), height());
+  bounds.set_origin(origin);
 
-  AvatarMenuBubbleView* bubble = new AvatarMenuBubbleView(this,
-      views::BubbleBorder::TOP_LEFT, bounds, browser_);
-  views::BubbleDelegateView::CreateBubble(bubble);
-  bubble->Show();
+  AvatarMenuBubbleView* bubble_view = new AvatarMenuBubbleView(browser_);
+  // Bubble::Show() takes ownership of the view.
+  bubble_ = Bubble::Show(browser_view->GetWidget(), bounds,
+      views::BubbleBorder::TOP_LEFT,
+      views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR, bubble_view, bubble_view);
+  bubble_->AddObserver(this);
 
   ProfileMetrics::LogProfileOpenMethod(ProfileMetrics::ICON_AVATAR_BUBBLE);
 }
+
+void AvatarMenuButton::OnBubbleClosing() {
+  bubble_->RemoveObserver(this);
+  bubble_ = NULL;
+}