Removing Fast User Switcher feature.

chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
 
 #import <Carbon/Carbon.h>  // kVK_Return.
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
@@ skipping 1372 matching lines @@
     case profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH:
       subView = [self buildGaiaEmbeddedView];
       break;
     case profiles::BUBBLE_VIEW_MODE_ACCOUNT_REMOVAL:
       subView = [self buildAccountRemovalView];
       break;
     case profiles::BUBBLE_VIEW_MODE_SWITCH_USER:
       subView = [self buildSwitchUserView];
       break;
     case profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER:
-    case profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER:
     case profiles::BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT:
       subView = [self buildProfileChooserView];
       break;
   }
 
   // Clears tutorial mode for all non-profile-chooser views.
   if (viewMode_ != profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER)
     tutorialMode_ = profiles::TUTORIAL_MODE_NONE;
 
   // Add a dummy, empty element so that we don't initially display any
@@ skipping 80 matching lines @@
           createCurrentProfileAccountsView:NSMakeRect(0, yOffset,
                                                       kFixedMenuWidth, 0)];
       [container addSubview:currentProfileAccountsView];
       yOffset = NSMaxY([currentProfileAccountsView frame]);
 
       yOffset = [self addSeparatorToContainer:container atYOffset:yOffset];
     } else {
       // This is the case when the user selects the sign out option in the user
       // menu upon encountering unrecoverable errors. Afterwards, the profile
       // chooser view is shown instead of the account management view.
-      viewMode_ = profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER;
+      viewMode_ = profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
     }
   }
 
   // Active profile card.
   if (currentProfileView) {
     const CGFloat verticalSpacing = kRelatedControllVerticalSpacing;
     yOffset += verticalSpacing;
     [currentProfileView setFrameOrigin:NSMakePoint(0, yOffset)];
     [container addSubview:currentProfileView];
     yOffset = NSMaxY([currentProfileView frame]) + verticalSpacing;
@@ skipping 22 matching lines @@
   base::scoped_nsobject<NSView> container(
       [[NSView alloc] initWithFrame:NSZeroRect]);
 
   NSView* tutorialView = nil;
   NSView* syncErrorView = nil;
   NSView* currentProfileView = nil;
   base::scoped_nsobject<NSMutableArray> otherProfiles(
       [[NSMutableArray alloc] init]);
   // Local and guest profiles cannot lock their profile.
   bool showLock = false;
-  bool isFastProfileChooser =
-      viewMode_ == profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER;
-  if (isFastProfileChooser) {
-    // The user is using right-click switching, no need to tell them about it.
-    PrefService* localState = g_browser_process->local_state();
-    localState->SetBoolean(
-        prefs::kProfileAvatarRightClickTutorialDismissed, true);
-  }
 
   // Loop over the profiles in reverse, so that they are sorted by their
   // y-coordinate, and separate them into active and "other" profiles.
   for (int i = avatarMenu_->GetNumberOfItems() - 1; i >= 0; --i) {
     const AvatarMenu::Item& item = avatarMenu_->GetItemAt(i);
     if (item.active) {
       syncErrorView = [self buildSyncErrorViewIfNeeded];
       currentProfileView = [self createCurrentProfileView:item];
       showLock = item.signed_in &&
           profiles::IsLockAvailable(browser_->profile());
     } else {
       [otherProfiles addObject:[self createOtherProfileView:i]];
     }
   }
   firstProfileView_ = [otherProfiles lastObject];
   if (!currentProfileView)  // Guest windows don't have an active profile.
     currentProfileView = [self createGuestProfileView];
 
   // |yOffset| is the next position at which to draw in |container|
   // coordinates. Add a pixel offset so that the bottom option buttons don't
   // overlap the bubble's rounded corners.
   CGFloat yOffset = 1;
 
-  if (!isFastProfileChooser)
-    [self buildProfileChooserViewWithProfileView:currentProfileView
-                                    tutorialView:tutorialView
-                                   syncErrorView:syncErrorView
-                                   otherProfiles:otherProfiles.get()
-                                       atYOffset:yOffset
-                                     inContainer:container
-                                        showLock:showLock];
-
+  [self buildProfileChooserViewWithProfileView:currentProfileView
+                                  tutorialView:tutorialView
+                                 syncErrorView:syncErrorView
+                                 otherProfiles:otherProfiles.get()
+                                     atYOffset:yOffset
+                                   inContainer:container
+                                      showLock:showLock];
   return container.autorelease();
 }
 
 - (NSView*)buildSigninConfirmationView {
   ProfileMetrics::LogProfileNewAvatarMenuSignin(
       ProfileMetrics::PROFILE_AVATAR_MENU_SIGNIN_VIEW);
 
   NSString* titleMessage = l10n_util::GetNSString(
       IDS_PROFILES_CONFIRM_SIGNIN_TUTORIAL_TITLE);
   NSString* contentMessage = l10n_util::GetNSString(
@@ skipping 1100 matching lines @@
 
 - (void)showWindow:(id)sender {
   [super showWindow:sender];
   NSEvent *event = [[NSApplication sharedApplication] currentEvent];
   if (firstProfileView_ && [event type] == NSKeyDown) {
     [[self window] makeFirstResponder:firstProfileView_];
   }
 }
 
 @end