Fix fast user switcher appearance when empty.

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 476 matching lines @@
 
 // static
 void ProfileChooserView::ShowBubble(
     profiles::BubbleViewMode view_mode,
     profiles::TutorialMode tutorial_mode,
     const signin::ManageAccountsParams& manage_accounts_params,
     views::View* anchor_view,
     views::BubbleBorder::Arrow arrow,
     views::BubbleBorder::BubbleAlignment border_alignment,
     Browser* browser) {
+

[Alexei Svitkine (slow), 2015/02/19 22:24:28]

Nit: No empty line in start of function body.

[anthonyvd, 2015/02/20 15:01:31]

Done.

+  // Don't start creating the view if it would be an empty fast user switcher.
+  // This is the case when there is 0 or 1 profiles (the current one).  It has
+  // to happen here to prevent the view system from creating an empty container.
+  if (view_mode == profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER &&
+      g_browser_process->profile_manager()->GetNumberOfProfiles() <= 1) {
+    return;
+  }
+
   if (IsShowing()) {
     if (tutorial_mode != profiles::TUTORIAL_MODE_NONE) {
       profile_bubble_->tutorial_mode_ = tutorial_mode;
       profile_bubble_->ShowView(view_mode, profile_bubble_->avatar_menu_.get());
     }
     return;
   }
 
   profile_bubble_ = new ProfileChooserView(anchor_view, arrow, browser,
       view_mode, tutorial_mode, manage_accounts_params.service_type);
@@ skipping 285 matching lines @@
         ProfileMetrics::PROFILE_AVATAR_MENU_NOT_YOU_BACK);
   } else {
     // Either one of the "other profiles", or one of the profile accounts
     // buttons was pressed.
     ButtonIndexes::const_iterator profile_match =
         open_other_profile_indexes_map_.find(sender);
     if (profile_match != open_other_profile_indexes_map_.end()) {
       avatar_menu_->SwitchToProfile(
           profile_match->second,
           ui::DispositionFromEventFlags(event.flags()) == NEW_WINDOW,
-          ProfileMetrics::SWITCH_PROFILE_ICON);
+          ProfileMetrics::SWITCH_PROFILE_FAST_SWITCHER);

[Mike Lerman, 2015/02/20 14:40:57]

Don't we want to send SWITCH_PROFILE_FAST_SWITCHER only if the view_mode ==
BUBBLE_BIEW_MODE_FAST_PROFILE_CHOOSER? Otherwise we can just keep using
SWITCH_PROFILE_ICON, there's no value in moving to a new bucket; the two buckets
will have the same meaning. (an update to the description in histograms.xml may
be warranted, but that's it)

[anthonyvd, 2015/02/20 15:01:31]

You're absolutely right but SWITCH_PROFILE_ICON is still used when the New
Avatar Menu flag is disabled (it logs switches from the old bubble).  I'm
separating it into a different bucket to be able to separate the two at least
until the new avatar menu is the only one available.  Does that make sense?

[Mike Lerman, 2015/02/20 15:33:59]

We can always determine whether someone's in the New Avatar world vs. the Old
Avatar world by looking at which finch experiment they're reporting in, and
separate out the histograms reporting by Finch Experiment (this can be done
either on the histograms page as a filter or the variations page on
uma.googleplex).

Keeping it together also allows us to compare usage over time, especially
comparing back to the old avatar world of yester-year.

[anthonyvd, 2015/02/20 19:06:05]

Ah! I didn't think about separating by experiment. Very good point I'll change
it back.

     } else {
       // This was a profile accounts button.
       AccountButtonIndexes::const_iterator account_match =
           delete_account_button_map_.find(sender);
       if (account_match != delete_account_button_map_.end()) {
         account_id_to_remove_ = account_match->second;
         ShowView(profiles::BUBBLE_VIEW_MODE_ACCOUNT_REMOVAL,
             avatar_menu_.get());
       } else {
         account_match = reauth_account_button_map_.find(sender);
@@ skipping 892 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;
 }