Don't reopen avatar bubble view on second click

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/ui/browser.h"
 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "ui/gfx/canvas_skia.h"
@@ skipping 47 matching lines @@
   }
   taskbar->SetOverlayIcon(window, icon, L"");
   if (icon)
     DestroyIcon(icon);
 #endif
 }
 
 AvatarMenuButton::AvatarMenuButton(Browser* browser, bool has_menu)
     : MenuButton(NULL, std::wstring(), 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_)

[Peter Kasting, 2011/10/05 01:22:51]

Nit: Maybe this should just call OnBubbleClosing()?

[sail, 2011/10/05 01:32:10]

Done.

+    bubble_->RemoveObserver(this);
   // 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 35 matching lines @@
 }
 
 // If the icon changes, we need to set the taskbar decoration again.
 void AvatarMenuButton::SetIcon(const SkBitmap& icon) {
   views::MenuButton::SetIcon(icon);
   set_taskbar_decoration_ = true;
 }
 
 // views::ViewMenuDelegate implementation
 void AvatarMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
-  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(0, 0, width(), height());
   bounds.set_origin(origin);
 
   AvatarMenuBubbleView* bubble_view = new AvatarMenuBubbleView(browser_);
   // Bubble::Show() takes ownership of the view.
-  Bubble::Show(browser_view->GetWidget(), bounds,
-               views::BubbleBorder::TOP_LEFT,
-               bubble_view, bubble_view);
+  bubble_ = Bubble::Show(browser_view->GetWidget(), bounds,
+      views::BubbleBorder::TOP_LEFT, bubble_view, bubble_view);
+  bubble_->AddObserver(this);
 }
+
+void AvatarMenuButton::OnBubbleClosing(Bubble* bubble, bool closed_by_escape) {
+  bubble_->RemoveObserver(this);
+  bubble_ = NULL;
+}