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

chrome/browser/ui/views/profiles/profile_chooser_view.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/profile_chooser_view.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
@@ skipping 668 matching lines @@
           ProfileMetrics::PROFILE_AVATAR_MENU_NOT_YOU_VIEW);
       break;
     default:
       layout = CreateSingleColumnLayout(this, kFixedMenuWidth);
       sub_view = CreateProfileChooserView(avatar_menu);
   }
   // Clears tutorial mode for all non-profile-chooser views.
   if (view_mode_ != profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER)
     tutorial_mode_ = profiles::TUTORIAL_MODE_NONE;
 
+  if (view_mode_ != profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER ||
+      tutorial_mode_ != profiles::TUTORIAL_MODE_NONE)
+    profile_bubble_->set_close_on_deactivate(false);
+  else
+    profile_bubble_->set_close_on_deactivate(close_on_deactivate_for_testing_);
+

[Roger Tawa OOO till Jul 10th, 2015/05/08 14:51:17]

Nit: since this is a multi-line/complex if-then-else you need all the { and }.

I'm not sure about the logic.  For example, as is this code will cause the menu
to be sticky if |view_mode_| is BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT or
BUBBLE_VIEW_MODE_ACCOUNT_REMOVAL.  It should only be sticky for the three web
view modes.

Also, for the tutorial, this makes the welcome and error tutorials sticky, which
is not what we want.

Did I miss something?

   layout->StartRow(1, 0);
   layout->AddView(sub_view);
   Layout();
   if (GetBubbleFrameView())
     SizeToContents();
 }
 
 void ProfileChooserView::WindowClosing() {
   DCHECK_EQ(profile_bubble_, this);
   profile_bubble_ = NULL;
@@ skipping 1005 matching lines @@
       IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
           IncognitoModePrefs::DISABLED;
   return incognito_available && !browser_->profile()->IsGuestSession();
 }
 
 void ProfileChooserView::PostActionPerformed(
     ProfileMetrics::ProfileDesktopMenu action_performed) {
   ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_);
   gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE;
 }