Bring up the Fast User Switcher on Shift+Click on the new Avatar Button

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 62 matching lines @@
 const int kFixedMenuWidth = 250;
 const int kButtonHeight = 32;
 const int kFixedGaiaViewHeight = 440;
 const int kFixedGaiaViewWidth = 360;
 const int kFixedAccountRemovalViewWidth = 280;
 const int kFixedSwitchUserViewWidth = 320;
 const int kLargeImageSide = 88;
 
 const int kVerticalSpacing = 16;
 
+bool IsProfileChooser(profiles::BubbleViewMode mode) {
+  return mode == profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER ||
+    mode == profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER;

[Roger Tawa OOO till Jul 10th, 2015/01/29 23:00:35]

Two more spaces.

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

Done.

+}
+
 // Creates a GridLayout with a single column. This ensures that all the child
 // views added get auto-expanded to fill the full width of the bubble.
 views::GridLayout* CreateSingleColumnLayout(views::View* view, int width) {
   views::GridLayout* layout = new views::GridLayout(view);
   view->SetLayoutManager(layout);
 
   views::ColumnSet* columns = layout->AddColumnSet(0);
   columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 0,
                      views::GridLayout::FIXED, width, width);
   return layout;
@@ skipping 486 matching lines @@
   tutorial_close_button_ = NULL;
   tutorial_sync_settings_link_ = NULL;
   tutorial_see_whats_new_button_ = NULL;
   tutorial_not_you_link_ = NULL;
   tutorial_learn_more_link_ = NULL;
 }
 
 void ProfileChooserView::Init() {
   // If view mode is PROFILE_CHOOSER but there is an auth error, force
   // ACCOUNT_MANAGEMENT mode.
-  if (view_mode_ == profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER &&
+  if (IsProfileChooser(view_mode_) &&
       HasAuthError(browser_->profile()) &&
       switches::IsEnableAccountConsistency() &&
       avatar_menu_->GetItemAt(avatar_menu_->GetActiveProfileIndex()).
           signed_in) {
     view_mode_ = profiles::BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT;
   }
 
   // The arrow keys can be used to tab between items.
   AddAccelerator(ui::Accelerator(ui::VKEY_DOWN, ui::EF_NONE));
   AddAccelerator(ui::Accelerator(ui::VKEY_UP, ui::EF_NONE));
 
   ShowView(view_mode_, avatar_menu_.get());
 }
 
 void ProfileChooserView::OnAvatarMenuChanged(
     AvatarMenu* avatar_menu) {
-  if (view_mode_ == profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER ||
+  if (IsProfileChooser(view_mode_) ||
       view_mode_ == profiles::BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT) {
     // Refresh the view with the new menu. We can't just update the local copy
     // as this may have been triggered by a sign out action, in which case
     // the view is being destroyed.
     ShowView(view_mode_, avatar_menu);
   }
 }
 
 void ProfileChooserView::OnRefreshTokenAvailable(
     const std::string& account_id) {
@@ skipping 268 matching lines @@
       return true;
 
     profiles::UpdateProfileName(profile, new_profile_name);
     PostActionPerformed(ProfileMetrics::PROFILE_DESKTOP_MENU_EDIT_NAME);
     current_profile_name_->ShowReadOnlyView();
     return true;
   }
   return false;
 }
 
-views::View* ProfileChooserView::CreateProfileChooserView(
+void ProfileChooserView::PopulateCompleteProfileChooserView(
+    views::GridLayout* layout,
     AvatarMenu* avatar_menu) {
-  views::View* view = new views::View();
-  views::GridLayout* layout = CreateSingleColumnLayout(view, kFixedMenuWidth);
   // Separate items into active and alternatives.
   Indexes other_profiles;
   views::View* tutorial_view = NULL;
   views::View* current_profile_view = NULL;
   views::View* current_profile_accounts = NULL;
   views::View* option_buttons_view = NULL;
   for (size_t i = 0; i < avatar_menu->GetNumberOfItems(); ++i) {
     const AvatarMenu::Item& item = avatar_menu->GetItemAt(i);
     if (item.active) {
       option_buttons_view = CreateOptionsView(
           item.signed_in && profiles::IsLockAvailable(browser_->profile()));
       current_profile_view = CreateCurrentProfileView(item, false);
-      if (view_mode_ == profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER) {
+      if (IsProfileChooser(view_mode_)) {
         switch (tutorial_mode_) {
           case profiles::TUTORIAL_MODE_NONE:
           case profiles::TUTORIAL_MODE_WELCOME_UPGRADE:
             tutorial_view = CreateWelcomeUpgradeTutorialViewIfNeeded(
                 tutorial_mode_ == profiles::TUTORIAL_MODE_WELCOME_UPGRADE,
                 item);
             break;
           case profiles::TUTORIAL_MODE_CONFIRM_SIGNIN:
             tutorial_view = CreateSigninConfirmationView();
             break;
@@ skipping 19 matching lines @@
 
   if (!current_profile_view) {
     // Guest windows don't have an active profile.
     current_profile_view = CreateGuestProfileView();
     option_buttons_view = CreateOptionsView(false);
   }
 
   layout->StartRow(1, 0);
   layout->AddView(current_profile_view);
 
-  if (view_mode_ != profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER) {
+  if (!IsProfileChooser(view_mode_)) {
     DCHECK(current_profile_accounts);
     layout->StartRow(0, 0);
     layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
     layout->StartRow(1, 0);
     layout->AddView(current_profile_accounts);
   }
 
   if (browser_->profile()->IsSupervised()) {
     layout->StartRow(0, 0);
     layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
     layout->StartRow(1, 0);
     layout->AddView(CreateSupervisedUserDisclaimerView());
   }
 
-  if (view_mode_ == profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER) {
+  if (IsProfileChooser(view_mode_)) {
     layout->StartRow(1, 0);
-    if (switches::IsFastUserSwitching())
+    if (switches::IsFastUserSwitching() ||
+        view_mode_ == profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER) {

[Roger Tawa OOO till Jul 10th, 2015/01/29 23:00:35]

Do we still need this view_mode_ check?

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

Done.

       layout->AddView(CreateOtherProfilesView(other_profiles));
+    }
   }
 
   layout->StartRow(0, 0);
   layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
 
   if (option_buttons_view) {
     layout->StartRow(0, 0);
     layout->AddView(option_buttons_view);
   }
+}
+
+void ProfileChooserView::PopulateMinimalProfileChooserView(
+    views::GridLayout* layout,
+    AvatarMenu* avatar_menu) {
+  Indexes other_profiles;
+  for (size_t i = 0; i < avatar_menu->GetNumberOfItems(); ++i) {
+    const AvatarMenu::Item& item = avatar_menu->GetItemAt(i);
+    if (!item.active) {
+      other_profiles.push_back(i);
+    }
+  }
+
+  layout->StartRow(1, 0);
+  layout->AddView(CreateOtherProfilesView(other_profiles));
+}
+
+views::View* ProfileChooserView::CreateProfileChooserView(
+    AvatarMenu* avatar_menu) {
+  views::View* view = new views::View();
+  views::GridLayout* layout = CreateSingleColumnLayout(view, kFixedMenuWidth);
+
+  if (view_mode_ == profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER) {
+    PopulateMinimalProfileChooserView(layout, avatar_menu);
+  } else {
+    PopulateCompleteProfileChooserView(layout, avatar_menu);
+  }
 
   return view;
 }
 
 void ProfileChooserView::DismissTutorial() {
   // Never shows the upgrade tutorial again if manually closed.
   if (tutorial_mode_ == profiles::TUTORIAL_MODE_WELCOME_UPGRADE) {
     browser_->profile()->GetPrefs()->SetInteger(
         prefs::kProfileAvatarTutorialShown,
         signin_ui_util::kUpgradeWelcomeTutorialShowMax + 1);
@@ skipping 167 matching lines @@
   layout->AddView(current_profile_name_);
 
   if (is_guest)
     return view;
 
   // The available links depend on the type of profile that is active.
   if (avatar_item.signed_in) {
     layout->StartRow(1, 0);
     if (switches::IsEnableAccountConsistency()) {
       base::string16 link_title = l10n_util::GetStringUTF16(
-          view_mode_ == profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER ?
+          IsProfileChooser(view_mode_) ?
               IDS_PROFILES_PROFILE_MANAGE_ACCOUNTS_BUTTON :
               IDS_PROFILES_PROFILE_HIDE_MANAGE_ACCOUNTS_BUTTON);
       manage_accounts_link_ = CreateLink(link_title, this);
       manage_accounts_link_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
       layout->AddView(manage_accounts_link_);
     } else {
       // Badge the email address if there's an authentication error.
       if (HasAuthError(browser_->profile())) {
         const gfx::ImageSkia warning_image = *rb->GetImageNamed(
             IDR_ICON_PROFILES_ACCOUNT_BUTTON_ERROR).ToImageSkia();
@@ skipping 491 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;
 }