Revert of 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 102 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 in the
-  // current browser and Hide it if it's showing in another browser.
-  ProfileChooserView::ShowingType show_type =
-      ProfileChooserView::IsShowingInBrowser(browser_);
-  if (show_type == ProfileChooserView::IS_SHOWING)
-    suppress_mouse_released_action_ = true;
-  else if (show_type == ProfileChooserView::IS_SHOWING_IN_ANOTHER_BROWSER)
-    ProfileChooserView::Hide();
+  // Prevent the bubble from being re-shown if it's already showing.
+  suppress_mouse_released_action_ = ProfileChooserView::IsShowing();
   return LabelButton::OnMousePressed(event);
 }
 
 void NewAvatarButton::OnMouseReleased(const ui::MouseEvent& event) {
   if (suppress_mouse_released_action_)
     suppress_mouse_released_action_ = false;
   else
     LabelButton::OnMouseReleased(event);
 }
 
@@ skipping 67 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();
 }