Avatar Bubble doesn't re-pop when trying to click it away.

chrome/browser/ui/views/profiles/new_avatar_button.cc

 // 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.
 
 #include "chrome/browser/ui/views/profiles/new_avatar_button.h"
 
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/painter.h"
 
 namespace {
 
 scoped_ptr<views::Border> CreateBorder(const int normal_image_set[],
@@ skipping 21 matching lines @@
 
 NewAvatarButton::NewAvatarButton(
     views::ButtonListener* listener,
     const base::string16& profile_name,
     AvatarButtonStyle button_style,
     Browser* browser)
     : MenuButton(listener,
                  profiles::GetAvatarButtonTextForProfile(browser->profile()),
                  NULL,
                  true),
-      browser_(browser) {
+      browser_(browser),
+      suppress_mouse_released_action_(false) {
   set_animate_on_state_change(false);
   SetTextColor(views::Button::STATE_NORMAL, SK_ColorWHITE);
   SetTextColor(views::Button::STATE_HOVERED, SK_ColorWHITE);
   SetTextColor(views::Button::STATE_PRESSED, SK_ColorWHITE);
   SetTextShadows(gfx::ShadowValues(10,
       gfx::ShadowValue(gfx::Point(), 1.0f, SK_ColorDKGRAY)));
   SetTextSubpixelRenderingEnabled(false);
 
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   if (button_style == THEMED_BUTTON) {
@@ skipping 40 matching lines @@
 
 NewAvatarButton::~NewAvatarButton() {
   g_browser_process->profile_manager()->
       GetProfileInfoCache().RemoveObserver(this);
   SigninErrorController* error =
       profiles::GetSigninErrorController(browser_->profile());
   if (error)
     error->RemoveObserver(this);
 }
 
+bool NewAvatarButton::OnMousePressed(const ui::MouseEvent& event) {
+  // If the avatar bubble is showing then don't reshow it when the mouse is

[msw, 2014/08/20 21:12:36]

nit: aim for one-liners, like "Prevent the bubble from being re-shown on release
if it's already showing."

[Mike Lerman, 2014/08/21 15:15:36]

Done.

+  // released.
+  suppress_mouse_released_action_ = ProfileChooserView::IsShowing();
+
+  // We want to show the avatar bubble on mouse release; that is the standard
+  // behavior for buttons.
+  return true;

[msw, 2014/08/20 21:12:36]

Return MenuButton::OnMousePressed. Remove comment and blank line above.

[Mike Lerman, 2014/08/21 15:15:36]

Done.

+}
+
+bool NewAvatarButton::IsMouseReleaseActionSuppressed() {

[msw, 2014/08/20 21:12:36]

Remove this and instead override NewAvatarButton::OnMouseReleased to only call
MenuButton::OnMouseReleased if the flag isn't set, then clear the flag.

[Mike Lerman, 2014/08/21 15:15:36]

That is much cleaner. I didn't imagine swallowing the MouseReleased event here
would prevent the ButtonPressed event on the browser_frame objects, but I'm glad
it does!

+  if (suppress_mouse_released_action_) {
+    suppress_mouse_released_action_ = false;
+    return true;
+  }
+  return false;
+}
+
 void NewAvatarButton::OnProfileAdded(const base::FilePath& profile_path) {
   UpdateAvatarButtonAndRelayoutParent();
 }
 
 void NewAvatarButton::OnProfileWasRemoved(
       const base::FilePath& profile_path,
       const base::string16& profile_name) {
   UpdateAvatarButtonAndRelayoutParent();
 }
 
@@ skipping 27 matching lines @@
   // We want the button to resize if the new text is shorter.
   SetText(profiles::GetAvatarButtonTextForProfile(browser_->profile()));
   SetMinSize(gfx::Size());
   InvalidateLayout();
 
   // Because the width of the button might have changed, the parent browser
   // frame needs to recalculate the button bounds and redraw it.
   if (parent())
     parent()->Layout();
 }