Removing Fast User Switcher feature.

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/macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/vector_icons/vector_icons.h"
@@ skipping 97 matching lines @@
 
 // Spacing between the edge of the material design user menu and the
 // top/bottom or left/right of the menu items.
 const int kMenuEdgeMargin = 16;
 
 const int kVerticalSpacing = 16;
 
 const int kTitleViewNativeWidgetOffset = 8;
 
 bool IsProfileChooser(profiles::BubbleViewMode mode) {
-  return mode == profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER ||
-      mode == profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER;
+  return mode == profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
 }
 
 // DEPRECATED: New user menu components should use views::BoxLayout instead.
 // 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);
@@ skipping 396 matching lines @@
 
 // static
 void ProfileChooserView::ShowBubble(
     profiles::BubbleViewMode view_mode,
     profiles::TutorialMode tutorial_mode,
     const signin::ManageAccountsParams& manage_accounts_params,
     signin_metrics::AccessPoint access_point,
     views::View* anchor_view,
     Browser* browser,
     bool is_source_keyboard) {
-  // Don't start creating the view if it would be an empty fast user switcher.
-  // It has to happen here to prevent the view system from creating an empty
-  // container.
-  // Same for material design user menu since fast profile switcher will be
-  // migrated to the left-click menu.
-  if (view_mode == profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER)
-    return;
-
   if (IsShowing()) {
     if (tutorial_mode != profiles::TUTORIAL_MODE_NONE) {
       profile_bubble_->tutorial_mode_ = tutorial_mode;
       profile_bubble_->ShowViewFromMode(view_mode);
     }
     return;
   }
 
   profile_bubble_ =
       new ProfileChooserView(anchor_view, browser, view_mode, tutorial_mode,
@@ skipping 198 matching lines @@
       sub_view = CreateAccountRemovalView();
       break;
     case profiles::BUBBLE_VIEW_MODE_SWITCH_USER:
       layout = CreateSingleColumnLayout(this, kFixedSwitchUserViewWidth);
       sub_view = CreateSwitchUserView();
       ProfileMetrics::LogProfileNewAvatarMenuNotYou(
           ProfileMetrics::PROFILE_AVATAR_MENU_NOT_YOU_VIEW);
       break;
     case profiles::BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT:
     case profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER:
-    case profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER:
       layout = CreateSingleColumnLayout(this, kFixedMenuWidth);
       sub_view = CreateProfileChooserView(avatar_menu);
       break;
   }
   // Clears tutorial mode for all non-profile-chooser views.
   if (view_mode_ != profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER)
     tutorial_mode_ = profiles::TUTORIAL_MODE_NONE;
 
   layout->StartRow(1, 0);
   layout->AddView(sub_view);
@@ skipping 223 matching lines @@
     signin_ui_util::ShowSigninErrorLearnMorePage(browser_->profile());
   }
 }
 
 void ProfileChooserView::StyledLabelLinkClicked(views::StyledLabel* label,
                                                 const gfx::Range& range,
                                                 int event_flags) {
   chrome::ShowSettings(browser_);
 }
 
-void ProfileChooserView::PopulateCompleteProfileChooserView(
-    views::GridLayout* layout,
+views::View* ProfileChooserView::CreateProfileChooserView(
     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* sync_error_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) {
@@ skipping 46 matching lines @@
     layout->AddView(CreateSupervisedUserDisclaimerView());
   }
 
   layout->StartRow(0, 0);
   layout->AddView(new views::Separator());
 
   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);
-    // The user is using right-click switching, no need to tell them about it.
-    PrefService* local_state = g_browser_process->local_state();
-    local_state->SetBoolean(
-        prefs::kProfileAvatarRightClickTutorialDismissed, true);
-  } 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 849 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;
 }