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) {
+  // 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) {

[Mike Lerman, 2015/02/20 15:34:00]

The ProfileManager only shows you the number of Loaded profiles (and also can
include guest!). We want all profiles. This can be gotten from the
ProfileInfoCache in general or perhaps from the avatar_menu_ object for this
class.

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

Hm, this function is static and the avatar_menu_ object hasn't been created yet.
However, I see that ProfileManager::GetNumberOfProfiles just calls
ProfileInfoCache::GetNumberOfProfiles directly. What is the latter supposed to
return? On my machine I can just fire up Chrome and it returns the total number
of profiles, not just the opened ones (let's say I have 3 profiles on my machine
it'll return 3 even though I haven't switched to any profile). Thoughts?

[Mike Lerman, 2015/02/20 19:17:09]

Ah - I didn't realize the ProfileManager just calls through to the
ProfileInfoCache. Nothing to do here, then :)

+    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);
     } 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;
 }