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

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 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/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 2490 matching lines @@
     gfx::Rect bounds(origin, anchor_view->size());
     views::BubbleBorder::ArrowPaintType arrow_paint_type =
         ShouldHideUIForFullscreen() ? views::BubbleBorder::PAINT_TRANSPARENT :
                                       views::BubbleBorder::PAINT_NORMAL;
     AvatarMenuBubbleView::ShowBubble(anchor_view, arrow, arrow_paint_type,
                                      alignment, bounds, browser());
   }
   ProfileMetrics::LogProfileOpenMethod(ProfileMetrics::ICON_AVATAR_BUBBLE);
 }
 
+void BrowserView::CloseAvatarBubbleFromAvatarButton() {
+  if (switches::IsNewAvatarMenu()) {

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

The check for switches::IsNewAvatarMenu() is missing from the cocoa code.  Is it
needed there?

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

Can't, since both menus in cocoa code have common derived close
avatarButtonController with Hide() interface, then both of them override it,
however, in Linux/Window new and old menus both independently declared and
implemented a static function Hide().

+    if (ProfileChooserView::IsShowing())
+      ProfileChooserView::Hide();
+  } else {
+    if (AvatarMenuBubbleView::IsShowing())
+      AvatarMenuBubbleView::Hide();
+  }

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

You don't need the calls to IsShowing() in both cases, since the Hide() methods
already do that.

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

Done.

+}
+
 int BrowserView::GetRenderViewHeightInsetWithDetachedBookmarkBar() {
   if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED ||
       !bookmark_bar_view_.get() || !bookmark_bar_view_->IsDetached()) {
     return 0;
   }
   // Don't use bookmark_bar_view_->height() which won't be the final height if
   // the bookmark bar is animating.
   return chrome::kNTPBookmarkBarHeight -
       bookmark_bar_view_->GetFullyDetachedToolbarOverlap();
 }
@@ skipping 85 matching lines @@
   return immersive_mode_controller()->IsEnabled();
 }
 
 views::Widget* BrowserView::GetBubbleAssociatedWidget() {
   return GetWidget();
 }
 
 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() {
   return top_container_->GetBoundsInScreen();
 }