Chrome user menu shouldn't close if a tab steals focus

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"
@@ skipping 30 matching lines @@
   return border.Pass();
 }
 
 }  // namespace
 
 NewAvatarButton::NewAvatarButton(views::ButtonListener* listener,
                                  AvatarButtonStyle button_style,
                                  Browser* browser)
     : LabelButton(listener, base::string16()),
       browser_(browser),
-      has_auth_error_(false),
-      suppress_mouse_released_action_(false) {
+      has_auth_error_(false) {
   set_triggerable_event_flags(
       ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON);
   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);
   SetTextSubpixelRenderingEnabled(false);
   SetHorizontalAlignment(gfx::ALIGN_CENTER);
 
   // The largest text height that fits in the button. If the font list height
@@ skipping 50 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) {
-  // Prevent the bubble from being re-shown if it's already showing.
-  suppress_mouse_released_action_ = ProfileChooserView::IsShowing();
+  if (ProfileChooserView::IsShowing())
+    ProfileChooserView::Hide();
   return LabelButton::OnMousePressed(event);
 }
 
 void NewAvatarButton::OnMouseReleased(const ui::MouseEvent& event) {
-  if (suppress_mouse_released_action_)
-    suppress_mouse_released_action_ = false;
-  else

[Roger Tawa OOO till Jul 10th, 2015/05/14 18:55:03]

This change makes it so that clicking a second time on the same avatar button
causes the popup to close and reopen.  We should maintain the old behaviour
which was to close the popup.

[gogerald1, 2015/05/14 21:35:22]

Done.

     LabelButton::OnMouseReleased(event);
 }
 
 void NewAvatarButton::OnProfileAdded(const base::FilePath& profile_path) {
   Update();
 }
 
 void NewAvatarButton::OnProfileWasRemoved(
       const base::FilePath& profile_path,
       const base::string16& profile_name) {
@@ skipping 60 matching lines @@
     SetImage(views::Button::STATE_NORMAL, gfx::ImageSkia());
   }
 
   // If we are not using the generic button, then reset the spacing between
   // the text and the possible authentication error icon.
   const int kDefaultImageTextSpacing = 5;
   SetImageLabelSpacing(use_generic_button ? 0 : kDefaultImageTextSpacing);
 
   PreferredSizeChanged();
 }