Close avatar bubble when avatar button is clicked a second time

chrome/browser/ui/views/avatar_menu_button.cc

 // Copyright (c) 2012 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/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/managed_mode/managed_mode.h"
@@ skipping 82 matching lines @@
     : MenuButton(NULL, string16(), this, false),
       browser_(browser),
       incognito_(incognito),
       is_gaia_picture_(false),
       old_height_(0) {
   // In RTL mode, the avatar icon should be looking the opposite direction.
   EnableCanvasFlippingForRTLUI(true);
 }
 
 AvatarMenuButton::~AvatarMenuButton() {
+  if (bubble_widget_)
+    OnWidgetClosing(bubble_widget_);
 }
 
 void AvatarMenuButton::OnPaint(gfx::Canvas* canvas) {
   if (!icon_.get())
     return;
 
   if (old_height_ != height() || button_icon_.isNull()) {
     old_height_ = height();
     button_icon_ = *profiles::GetAvatarIconForTitleBar(
         *icon_, is_gaia_picture_, width(), height()).ToImageSkia();
@@ skipping 39 matching lines @@
                                            const gfx::Point& point) {
   if (incognito_)
     return;
 
   if (ManagedMode::IsInManagedMode())
     ManagedMode::LeaveManagedMode();
   else
     ShowAvatarBubble();
 }
 
+void AvatarMenuButton::OnWidgetClosing(views::Widget* widget) {
+  bubble_widget_->RemoveObserver(this);
+  bubble_widget_ = NULL;
+  // If the avatar bubble is about to be shown the cancel the operation. This
+  // prevents the bubble from closing and immediately reopening when the user
+  // clicks the avatar button a second time.
+  show_avatar_bubble_closure_.Cancel();
+}
+
 void AvatarMenuButton::ShowAvatarBubble() {
+  show_avatar_bubble_closure_.Reset(
+      base::Bind(&AvatarMenuButton::ShowAvatarBubbleImpl,
+      base::Unretained(this)));
+  MessageLoop::current()->PostTask(FROM_HERE,
+                                   show_avatar_bubble_closure_.callback());

[Peter Kasting, 2012/12/28 18:55:55]

This has three problems:

(1) It makes the menu opening more laggy by whatever the UI loop latency is.  In
theory that latency is "low" but in practice it can definitely be noticeable, at
least enough to make something feel just a tiny bit off.
(2) This solution is somewhat complex.
(3) I presume this works because on mouse down, the old bubble is first hidden
(but not destroyed), then OnMenuButtonClicked() is reached (creating a new
bubble), then the old widget is destroyed (calling OnWidgetClosing())?  Relying
on this destruction order seems fragile because we could easily change the
"hide, destroy asynchronously" behavior to "destroy now" and break this code.

It seems like maybe a better solution here is to simply add some kind of
OnMousePressed() handler on the menubutton that says "hey, the bubble is
currently open, ignore the next OnMenuButtonClicked() call" and then calls
through to the superclass implementation (which will then call back to
OnMenuButtonClicked()).  This still needs to detect whether the menu is already
open -- I'm not sure of the best way to do that, perhaps something like
|bubble_widget_|, perhaps some sort of static method on AvatarMenuBubbleView,
perhaps passing |this| to AvatarMenuBubbleView so it can call back when it's
hidden/destroyed -- but seems like it at least avoids the asynchronicity.

[sail, 2013/01/02 21:06:01]

Done.
I changed this to match the bookmark code by having a static reference to the
open bubble.

+}
+
+void AvatarMenuButton::ShowAvatarBubbleImpl() {

[Peter Kasting, 2012/12/28 18:55:55]

There's nearly identical code to this in browser_view.cc.  Can we make it call
through to here (or better yet, make all its callers call here) instead of
duplicating code?  While I don't _think_ that code needs the fix here, it would
be nice not to have the confusion.

(Incidentally, the same applies to GTK.)

[sail, 2013/01/02 21:06:01]

Done.

+  if (bubble_widget_)
+    return;
+
   DCHECK(chrome::IsCommandEnabled(browser_, IDC_SHOW_AVATAR_MENU));
 
   gfx::Point origin;
   views::View::ConvertPointToScreen(this, &origin);
   gfx::Rect bounds(origin, size());
 
   AvatarMenuBubbleView* bubble = new AvatarMenuBubbleView(this,
       views::BubbleBorder::TOP_LEFT, bounds, browser_);
-  views::BubbleDelegateView::CreateBubble(bubble);
+  bubble_widget_ = views::BubbleDelegateView::CreateBubble(bubble);
+  bubble_widget_->AddObserver(this);
   bubble->Show();
 
   ProfileMetrics::LogProfileOpenMethod(ProfileMetrics::ICON_AVATAR_BUBBLE);
 }