Removing pre-material design menu setting.

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 76 matching lines @@
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/native_theme/common_theme.h"
 #include "ui/native_theme/native_theme.h"
 
 namespace {
 
 // Constants taken from the Windows/Views implementation at:
 // chrome/browser/ui/views/profile_chooser_view.cc
 const int kLargeImageSide = 88;
-const int kSmallImageSide = 32;
 const int kMdImageSide = 40;
 
 const CGFloat kVerticalSpacing = 16.0;
 const CGFloat kSmallVerticalSpacing = 10.0;
 const CGFloat kRelatedControllVerticalSpacing = 8.0;
 const CGFloat kHorizontalSpacing = 16.0;
 const CGFloat kTitleFontSize = 15.0;
 const CGFloat kTextFontSize = 12.0;
 const CGFloat kProfileButtonHeight = 30;
 const int kBezelThickness = 3;  // Width of the bezel on an NSButton.
-const int kImageTitleSpacing = 10;
 const int kBlueButtonHeight = 30;
 const CGFloat kFocusRingLineWidth = 2;
 
 // Fixed size for embedded sign in pages as defined in Gaia.
 const CGFloat kFixedGaiaViewWidth = 360;
 
 // Fixed size for the account removal view.
 const CGFloat kFixedAccountRemovalViewWidth = 280;
 
 // Fixed size for the switch user view.
 const int kFixedSwitchUserViewWidth = 320;
 
 // The tag number for the primary account.
 const int kPrimaryProfileTag = -1;
 
 CGFloat GetFixedMenuWidth() {

[msarda, 2017/02/23 11:51:02]

Nit: This should not be a constant named kFixedMenuWidth

[jlebel, 2017/02/23 18:18:49]

Done.

-  return switches::IsMaterialDesignUserMenu() ? 240.0 : 250.0;
+  return 240.0;
 }
 
 NSImage* CreateProfileImage(const gfx::Image& icon,
                             int imageSize,
                             profiles::AvatarShape shape) {
   return (profiles::GetSizedAvatarIcon(icon, true /* image is a square */,
                                        imageSize, imageSize, shape))
       .ToNSImage();
 }
 
@@ skipping 718 matching lines @@
 
     [self setBordered:NO];
     [self setFont:[NSFont labelFontOfSize:kTextFontSize]];
     [self setButtonType:NSMomentaryChangeButton];
 
     base::scoped_nsobject<CustomPaddingImageButtonCell> cell(
         [[CustomPaddingImageButtonCell alloc]
             initWithLeftMarginSpacing:kHorizontalSpacing
                     imageTitleSpacing:imageTitleSpacing]);
     [cell setLineBreakMode:NSLineBreakByTruncatingTail];
-    if (switches::IsMaterialDesignUserMenu())
-      [cell setHighlightsBy:NSNoCellMask];
+    [cell setHighlightsBy:NSNoCellMask];
     [self setCell:cell.get()];
   }
   return self;
 }
 
 - (void)setRightMarginSpacing:(int)rightMarginSpacing {
   [[self cell] setRightMarginSpacing:rightMarginSpacing];
 }
 
 - (void)drawRect:(NSRect)dirtyRect {
@@ skipping 82 matching lines @@
                                   tutorialView:(NSView*)tutorialView
                                  syncErrorView:(NSView*)syncErrorView
                                  otherProfiles:(NSArray*)otherProfiles
                                      atYOffset:(CGFloat)yOffset
                                    inContainer:(NSView*)container
                                       showLock:(bool)showLock;
 
 // Builds the profile chooser view.
 - (NSView*)buildProfileChooserView;
 
-- (NSView*)buildTutorialViewIfNeededForItem:(const AvatarMenu::Item&)item;
-
 // Builds a tutorial card with a title label using |titleMessage|, a content
 // label using |contentMessage|, a link using |linkMessage|, and a button using
 // |buttonMessage|. If |stackButton| is YES, places the button above the link.
 // Otherwise places both on the same row with the link left aligned and button
 // right aligned. On click, the link would execute |linkAction|, and the button
 // would execute |buttonAction|. It sets |tutorialMode_| to the given |mode|.
 - (NSView*)tutorialViewWithMode:(profiles::TutorialMode)mode
                    titleMessage:(NSString*)titleMessage
                  contentMessage:(NSString*)contentMessage
                     linkMessage:(NSString*)linkMessage
@@ skipping 19 matching lines @@
 // Chrome sync will be delayed until the user either dismisses the tutorial, or
 // configures sync through the "Settings" link.
 - (NSView*)buildSigninConfirmationView;
 
 // Builds a tutorial card to show the last signin error.
 - (NSView*)buildSigninErrorView;
 
 // Creates the main profile card for the profile |item| at the top of
 // the bubble, for non-material-design and material design user menu
 // respectively.
-- (NSView*)createCurrentProfileView:(const AvatarMenu::Item&)item;
 - (NSView*)createMaterialDesignCurrentProfileView:(const AvatarMenu::Item&)item;
 
 // Creates the possible links for the main profile card with profile |item|.
 - (NSView*)createCurrentProfileLinksForItem:(const AvatarMenu::Item&)item
                                        rect:(NSRect)rect;
 
 // Creates the disclaimer text for supervised users, telling them that the
 // manager can view their history etc.
 - (NSView*)createSupervisedUserDisclaimerView;
 
 // Creates a main profile card for the guest user.
 - (NSView*)createGuestProfileView;
 
 // Creates an item for the profile |itemIndex| that is used in the fast profile
 // switcher view.
 - (NSButton*)createOtherProfileView:(int)itemIndex;
 
-// Creates the following option buttons: lock profile, go incognito, and switch
-// user/exit guest.
-- (NSView*)createOptionsViewWithRect:(NSRect)rect
-                         showLock:(BOOL)showLock;
 // For material design user menu, creates the following option buttons: lock
 // profile/close all windows, switch user/exit guest, and open guest profile.
 - (NSView*)createMaterialDesignOptionsViewWithFrame:(NSRect)frame
                                            showLock:(BOOL)showLock;
 
 // Creates the account management view for the active profile.
 - (NSView*)createCurrentProfileAccountsView:(NSRect)rect;
 
 // Creates the list of accounts for the active profile.
 - (NSView*)createAccountsListWithRect:(NSRect)rect;
@@ skipping 402 matching lines @@
 // yOffset after adding the elements.
 - (CGFloat)buildFastUserSwitcherViewWithProfiles:(NSArray*)otherProfiles
                                        atYOffset:(CGFloat)yOffset
                                      inContainer:(NSView*)container {
   // Other profiles switcher. The profiles have already been sorted
   // by their y-coordinate, so they can be added in the existing order.
   for (NSView* otherProfileView in otherProfiles) {
     [otherProfileView setFrameOrigin:NSMakePoint(0, yOffset)];
     [container addSubview:otherProfileView];
     yOffset = NSMaxY([otherProfileView frame]);
-
-    if (!switches::IsMaterialDesignUserMenu())
-      yOffset = [self addSeparatorToContainer:container atYOffset:yOffset];
   }
 
   [container setFrameSize:NSMakeSize(GetFixedMenuWidth(), yOffset)];
   return yOffset;
 }
 
 - (void)buildProfileChooserViewWithProfileView:(NSView*)currentProfileView
                                   tutorialView:(NSView*)tutorialView
                                  syncErrorView:(NSView*)syncErrorView
                                  otherProfiles:(NSArray*)otherProfiles
                                      atYOffset:(CGFloat)yOffset
                                    inContainer:(NSView*)container
                                       showLock:(bool)showLock {
-  if (switches::IsMaterialDesignUserMenu())
-    yOffset += kRelatedControllVerticalSpacing;
+  yOffset += kRelatedControllVerticalSpacing;
 
   // Option buttons.
   NSRect rect = NSMakeRect(0, yOffset, GetFixedMenuWidth(), 0);
   NSView* optionsView =
-      switches::IsMaterialDesignUserMenu()
-          ? [self createMaterialDesignOptionsViewWithFrame:rect
-                                                  showLock:showLock]
-          : [self createOptionsViewWithRect:rect showLock:showLock];
+      [self createMaterialDesignOptionsViewWithFrame:rect showLock:showLock];
   [container addSubview:optionsView];
   rect.origin.y = NSMaxY([optionsView frame]);
   yOffset = rect.origin.y;
 
-  // For material design user menu, add the fast user switching buttons.
-  if (switches::IsMaterialDesignUserMenu()) {
-    yOffset = [self buildFastUserSwitcherViewWithProfiles:otherProfiles
-                                                atYOffset:yOffset
-                                              inContainer:container];
-    yOffset += kRelatedControllVerticalSpacing;
-    rect.origin.y = yOffset;
-  }
+  // Add the fast user switching buttons.
+  yOffset = [self buildFastUserSwitcherViewWithProfiles:otherProfiles
+                                              atYOffset:yOffset
+                                            inContainer:container];
+  yOffset += kRelatedControllVerticalSpacing;
+  rect.origin.y = yOffset;
 
   NSBox* separator = [self horizontalSeparatorWithFrame:rect];
   [container addSubview:separator];
   yOffset = NSMaxY([separator frame]);
 
   // For supervised users, add the disclaimer text.
   if (browser_->profile()->IsSupervised()) {
-    yOffset += switches::IsMaterialDesignUserMenu() ? kVerticalSpacing
-                                                    : kSmallVerticalSpacing;
+    yOffset += kVerticalSpacing;
     NSView* disclaimerContainer = [self createSupervisedUserDisclaimerView];
     [disclaimerContainer setFrameOrigin:NSMakePoint(0, yOffset)];
     [container addSubview:disclaimerContainer];
     yOffset = NSMaxY([disclaimerContainer frame]);
-
-    if (!switches::IsMaterialDesignUserMenu()) {
-      yOffset += kSmallVerticalSpacing;
-      yOffset = [self addSeparatorToContainer:container atYOffset:yOffset];
-    }
   }
 
   if (viewMode_ == profiles::BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT) {
     const AvatarMenu::Item& item =
         avatarMenu_->GetItemAt(avatarMenu_->GetActiveProfileIndex());
     if (item.signed_in) {
       NSView* currentProfileAccountsView = [self
           createCurrentProfileAccountsView:NSMakeRect(0, yOffset,
                                                       GetFixedMenuWidth(), 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;
     }
   }
 
   // Active profile card.
   if (currentProfileView) {
-    const CGFloat verticalSpacing = switches::IsMaterialDesignUserMenu()
-                                        ? kRelatedControllVerticalSpacing
-                                        : kVerticalSpacing;
+    const CGFloat verticalSpacing = kRelatedControllVerticalSpacing;
     yOffset += verticalSpacing;
     [currentProfileView setFrameOrigin:NSMakePoint(0, yOffset)];
     [container addSubview:currentProfileView];
     yOffset = NSMaxY([currentProfileView frame]) + verticalSpacing;
   }
 
   if (syncErrorView) {
     yOffset = [self addSeparatorToContainer:container atYOffset:yOffset];
     [syncErrorView setFrameOrigin:NSMakePoint(0, yOffset)];
     [container addSubview:syncErrorView];
@@ skipping 30 matching lines @@
     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) {
-      if (switches::IsMaterialDesignUserMenu()) {
-        syncErrorView = [self buildSyncErrorViewIfNeeded];
-      } else if (viewMode_ == profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER) {
-        tutorialView = [self buildTutorialViewIfNeededForItem:item];
-      }
-      currentProfileView =
-          switches::IsMaterialDesignUserMenu()
-              ? [self createMaterialDesignCurrentProfileView:item]
-              : [self createCurrentProfileView:item];
+      syncErrorView = [self buildSyncErrorViewIfNeeded];
+      currentProfileView = [self createMaterialDesignCurrentProfileView: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) {
-    if (!switches::IsMaterialDesignUserMenu()) {
-      [self buildFastUserSwitcherViewWithProfiles:otherProfiles.get()
-                                        atYOffset:yOffset
-                                      inContainer:container];
-    }
-  } else {
+  if (!isFastProfileChooser) {
     [self buildProfileChooserViewWithProfileView:currentProfileView
                                     tutorialView:tutorialView
                                    syncErrorView:syncErrorView
                                    otherProfiles:otherProfiles.get()
                                        atYOffset:yOffset
                                      inContainer:container
                                         showLock:showLock];
   }
 
   return container.autorelease();
@@ skipping 83 matching lines @@
                              titleMessage:titleMessage
                            contentMessage:contentMessage
                               linkMessage:nil
                             buttonMessage:buttonMessage
                               stackButton:NO
                            hasCloseButton:NO
                                linkAction:nil
                              buttonAction:@selector(dismissTutorial:)];
 }
 
-- (NSView*)buildTutorialViewIfNeededForItem:(const AvatarMenu::Item&)item {
-  if (tutorialMode_ == profiles::TUTORIAL_MODE_CONFIRM_SIGNIN)
-    return [self buildSigninConfirmationView];
-
-  if (tutorialMode_ == profiles::TUTORIAL_MODE_SHOW_ERROR)
-    return [self buildSigninErrorView];
-
-  if (profiles::ShouldShowWelcomeUpgradeTutorial(
-      browser_->profile(), tutorialMode_)) {
-    if (tutorialMode_ != profiles::TUTORIAL_MODE_WELCOME_UPGRADE) {
-      Profile* profile = browser_->profile();
-      const int showCount = profile->GetPrefs()->GetInteger(
-          prefs::kProfileAvatarTutorialShown);
-      profile->GetPrefs()->SetInteger(
-          prefs::kProfileAvatarTutorialShown, showCount + 1);
-    }
-
-    return [self buildWelcomeUpgradeTutorialView:item];
-  }
-
-  if (profiles::ShouldShowRightClickTutorial(browser_->profile()))
-    return [self buildRightClickTutorialView];
-
-  return nil;
-}
-
 - (NSView*)tutorialViewWithMode:(profiles::TutorialMode)mode
                    titleMessage:(NSString*)titleMessage
                  contentMessage:(NSString*)contentMessage
                     linkMessage:(NSString*)linkMessage
                   buttonMessage:(NSString*)buttonMessage
                     stackButton:(BOOL)stackButton
                  hasCloseButton:(BOOL)hasCloseButton
                      linkAction:(SEL)linkAction
                    buttonAction:(SEL)buttonAction {
   tutorialMode_ = mode;
@@ skipping 208 matching lines @@
   [syncProblemIcon setImage:NSImageFromImageSkia(gfx::CreateVectorIcon(
                                 gfx::VectorIconId::SYNC_PROBLEM, iconSize,
                                 gfx::kGoogleRed700))];
   [container addSubview:syncProblemIcon];
 
   [container
       setFrameSize:NSMakeSize(GetFixedMenuWidth(), yOffset + kVerticalSpacing)];
   return container.autorelease();
 }
 
-- (NSView*)createCurrentProfileView:(const AvatarMenu::Item&)item {
-  base::scoped_nsobject<NSView> container([[NSView alloc]
-      initWithFrame:NSZeroRect]);
-
-  CGFloat xOffset = kHorizontalSpacing;
-  CGFloat yOffset = 0;
-  CGFloat availableTextWidth = GetFixedMenuWidth() - 2 * kHorizontalSpacing;
-  CGFloat maxAvailableTextWidth = GetFixedMenuWidth() - kHorizontalSpacing;
-
-  // Profile options. This can be a link to the accounts view, the profile's
-  // username for signed in users, or a "Sign in" button for local profiles.
-  SigninManagerBase* signinManager =
-      SigninManagerFactory::GetForProfile(
-          browser_->profile()->GetOriginalProfile());
-  if (!isGuestSession_ && signinManager->IsSigninAllowed()) {
-    NSView* linksContainer = [self
-        createCurrentProfileLinksForItem:item
-                                    rect:NSMakeRect(xOffset, yOffset,
-                                                    maxAvailableTextWidth, 0)];
-    [container addSubview:linksContainer];
-    yOffset = NSMaxY([linksContainer frame]);
-  }
-
-  // Profile name, centered.
-  bool editingAllowed = !isGuestSession_ &&
-                        !browser_->profile()->IsLegacySupervised();
-  base::scoped_nsobject<EditableProfileNameButton> profileName(
-      [[EditableProfileNameButton alloc]
-          initWithFrame:NSMakeRect(xOffset,
-                                   yOffset,
-                                   availableTextWidth,
-                                   kProfileButtonHeight)
-                profile:browser_->profile()
-            profileName:base::SysUTF16ToNSString(
-                            profiles::GetAvatarNameForProfile(
-                                browser_->profile()->GetPath()))
-         editingAllowed:editingAllowed
-         withController:self]);
-
-  [container addSubview:profileName];
-  yOffset = NSMaxY([profileName frame]) + 4;  // Adds a small vertical padding.
-
-  // Profile icon, centered.
-  xOffset = (GetFixedMenuWidth() - kLargeImageSide) / 2;
-  base::scoped_nsobject<EditableProfilePhoto> iconView(
-      [[EditableProfilePhoto alloc]
-          initWithFrame:NSMakeRect(xOffset, yOffset,
-                                   kLargeImageSide, kLargeImageSide)
-             avatarMenu:avatarMenu_.get()
-            profileIcon:item.icon
-         editingAllowed:!isGuestSession_
-         withController:self]);
-
-  [container addSubview:iconView];
-  yOffset = NSMaxY([iconView frame]);
-
-  if (browser_->profile()->IsSupervised()) {
-    base::scoped_nsobject<NSImageView> supervisedIcon(
-        [[NSImageView alloc] initWithFrame:NSZeroRect]);
-    int imageId = browser_->profile()->IsChild()
-        ? IDR_ICON_PROFILES_MENU_CHILD
-        : IDR_ICON_PROFILES_MENU_LEGACY_SUPERVISED;
-    ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
-    [supervisedIcon setImage:rb->GetNativeImageNamed(imageId).ToNSImage()];
-    NSSize size = [[supervisedIcon image] size];
-    [supervisedIcon setFrameSize:size];
-    NSRect parentFrame = [iconView frame];
-    [supervisedIcon setFrameOrigin:NSMakePoint(NSMaxX(parentFrame) - size.width,
-                                               NSMinY(parentFrame))];
-    [container addSubview:supervisedIcon];
-  }
-
-  [container setFrameSize:NSMakeSize(GetFixedMenuWidth(), yOffset)];
-  return container.autorelease();
-}
-
 - (NSView*)createMaterialDesignCurrentProfileView:
     (const AvatarMenu::Item&)item {
   base::scoped_nsobject<NSView> container(
       [[NSView alloc] initWithFrame:NSZeroRect]);
 
   CGFloat xOffset = kHorizontalSpacing;
   CGFloat yOffset = 0.0;
   CGFloat cardYOffset = kRelatedControllVerticalSpacing;
   CGFloat availableTextWidth =
       GetFixedMenuWidth() - 3.0 * kHorizontalSpacing - kMdImageSide;
@@ skipping 119 matching lines @@
     [profileCard addSubview:username];
   }
 
   yOffset = NSMaxY([profileCard frame]);
   [container setFrameSize:NSMakeSize(GetFixedMenuWidth(), yOffset)];
   return container.autorelease();
 }
 
 - (NSView*)createCurrentProfileLinksForItem:(const AvatarMenu::Item&)item
                                        rect:(NSRect)rect {
-  if (switches::IsMaterialDesignUserMenu()) {
-    // The branch is empty for material design user menu in non-account-
-    // consistency mode, because in that case, the username would appear in the
-    // profile card instead of as a separate link here.
-    SigninManagerBase* signinManager = SigninManagerFactory::GetForProfile(
-        browser_->profile()->GetOriginalProfile());
-    DCHECK((item.signed_in && switches::IsEnableAccountConsistency()) ||
-           (!item.signed_in && signinManager->IsSigninAllowed()));
-  }
+  // The branch is empty in non-account-consistency mode, because in that case,
+  // the username would appear in the profile card instead of as a separate link
+  // here.
+  SigninManagerBase* signinManager = SigninManagerFactory::GetForProfile(
+      browser_->profile()->GetOriginalProfile());
+  DCHECK((item.signed_in && switches::IsEnableAccountConsistency()) ||
+         (!item.signed_in && signinManager->IsSigninAllowed()));
 
   base::scoped_nsobject<NSView> container([[NSView alloc] initWithFrame:rect]);
 
   // Don't double-apply the left margin to the sub-views.
   rect.origin.x = 0;
 
   // Adds right padding.
   const CGFloat kRightPadding = kHorizontalSpacing;
   rect.size.width -= kRightPadding;
 
   // The available links depend on the type of profile that is active.
   if (item.signed_in) {
     NSButton* link = nil;
     if (switches::IsEnableAccountConsistency()) {
       NSString* linkTitle = l10n_util::GetNSString(
           viewMode_ == profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER ?
               IDS_PROFILES_PROFILE_MANAGE_ACCOUNTS_BUTTON :
               IDS_PROFILES_PROFILE_HIDE_MANAGE_ACCOUNTS_BUTTON);
       SEL linkSelector =
           (viewMode_ == profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER) ?
           @selector(showAccountManagement:) : @selector(hideAccountManagement:);
-      if (switches::IsMaterialDesignUserMenu()) {
-        rect.size.width +=
-            kRightPadding;  // Spans the width of the entire menu.
-        link = [self hoverButtonWithRect:NSMakeRect(0, 0, rect.size.width,
-                                                    kBlueButtonHeight)
-                                    text:linkTitle
-                                  action:linkSelector];
-      } else {
-        link = [self linkButtonWithTitle:linkTitle
-                             frameOrigin:rect.origin
-                                  action:linkSelector];
-      }
-    } else if (!switches::IsMaterialDesignUserMenu()) {
-      link = [self linkButtonWithTitle:base::SysUTF16ToNSString(item.username)
-                           frameOrigin:rect.origin
-                                action:nil];
-      if (HasAuthError(browser_->profile())) {
-        [link setImage:ui::ResourceBundle::GetSharedInstance().
-            GetNativeImageNamed(IDR_ICON_PROFILES_ACCOUNT_BUTTON_ERROR).
-            ToNSImage()];
-        [link setImagePosition:NSImageRight];
-        [link setTarget:self];
-        [link setAction:@selector(showAccountReauthenticationView:)];
-        [link setTag:kPrimaryProfileTag];
-        [[link cell]
-            accessibilitySetOverrideValue:l10n_util::GetNSStringF(
-            IDS_PROFILES_ACCOUNT_BUTTON_AUTH_ERROR_ACCESSIBLE_NAME,
-            item.username)
-                             forAttribute:NSAccessibilityTitleAttribute];
-      } else {
-        // Signed in profiles with no authentication errors do not have a
-        // clickable email link.
-        [link setEnabled:NO];
-      }
+      rect.size.width += kRightPadding;  // Spans the width of the entire menu.
+      link = [self hoverButtonWithRect:NSMakeRect(0, 0, rect.size.width,
+                                                  kBlueButtonHeight)
+                                  text:linkTitle
+                                action:linkSelector];
     }
     if (link) {
       // -linkButtonWithTitle sizeToFit's the link. We can use the height, but
       // need to re-stretch the width so that the link can be centered correctly
       // in the view.
       rect.size.height = [link frame].size.height;
-      if (!switches::IsMaterialDesignUserMenu())
-        [link setAlignment:NSCenterTextAlignment];
       [link setFrame:rect];
       [container addSubview:link];
       [container setFrameSize:rect.size];
     }
   } else {
     rect.size.height = kBlueButtonHeight;
     NSButton* signinButton = [[BlueLabelButton alloc] initWithFrame:rect];
 
     // Manually elide the button text so that the contents fit inside the bubble
     // This is needed because the BlueLabelButton cell resets the style on
     // every call to -cellSize, which prevents setting a custom lineBreakMode.
     NSString* elidedButtonText = base::SysUTF16ToNSString(gfx::ElideText(
         l10n_util::GetStringFUTF16(
             IDS_SYNC_START_SYNC_BUTTON_LABEL,
             l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)),
         gfx::FontList(), rect.size.width, gfx::ELIDE_TAIL));
 
     [signinButton setTitle:elidedButtonText];
-    if (switches::IsMaterialDesignUserMenu())
-      [signinButton sizeToFit];
+    [signinButton sizeToFit];
     [signinButton setTarget:self];
     [signinButton setAction:@selector(showInlineSigninPage:)];
     [container addSubview:signinButton];
 
     // Sign-in promo text.
     NSTextField* promo = BuildLabel(
         l10n_util::GetNSString(IDS_PROFILES_SIGNIN_PROMO),
         NSMakePoint(0, NSMaxY([signinButton frame]) + kVerticalSpacing),
         nil);
     if (kRightPadding >= 8)
       rect.size.width += 8;  // Re-stretch a little bit to fit promo text.
     DCHECK(kRightPadding >= 8);
     [promo setFrameSize:NSMakeSize(rect.size.width, 0)];
     [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:promo];
     [container addSubview:promo];
 
-    [container
-        setFrameSize:NSMakeSize(rect.size.width,
-                                NSMaxY([promo frame]) +
-                                    (switches::IsMaterialDesignUserMenu()
-                                         ? kRelatedControllVerticalSpacing
-                                         : 4))];
+    [container setFrameSize:NSMakeSize(rect.size.width,
+                                       NSMaxY([promo frame]) +
+                                           kRelatedControllVerticalSpacing)];
     content::RecordAction(
         base::UserMetricsAction("Signin_Impression_FromAvatarBubbleSignin"));
   }
 
   return container.autorelease();
 }
 
 - (NSView*)createSupervisedUserDisclaimerView {
   base::scoped_nsobject<NSView> container(
       [[NSView alloc] initWithFrame:NSZeroRect]);
@@ skipping 17 matching lines @@
   gfx::Image guestIcon =
       ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
           profiles::GetPlaceholderAvatarIconResourceID());
   AvatarMenu::Item guestItem(std::string::npos, /* menu_index, not used */
                              base::FilePath(), /* profile_path, not used */
                              guestIcon);
   guestItem.active = true;
   guestItem.name = base::SysNSStringToUTF16(
       l10n_util::GetNSString(IDS_PROFILES_GUEST_PROFILE_NAME));
 
-  return switches::IsMaterialDesignUserMenu()
-             ? [self createMaterialDesignCurrentProfileView:guestItem]
-             : [self createCurrentProfileView:guestItem];
+  return [self createMaterialDesignCurrentProfileView:guestItem];
 }
 
 - (NSButton*)createOtherProfileView:(int)itemIndex {
   const AvatarMenu::Item& item = avatarMenu_->GetItemAt(itemIndex);
 
   NSRect rect = NSMakeRect(0, 0, GetFixedMenuWidth(),
                            kBlueButtonHeight + kSmallVerticalSpacing);
-  const int imageTitleSpacing = switches::IsMaterialDesignUserMenu()
-                                    ? kHorizontalSpacing
-                                    : kImageTitleSpacing;
+  const int imageTitleSpacing = kHorizontalSpacing;
   base::scoped_nsobject<BackgroundColorHoverButton> profileButton(
       [[BackgroundColorHoverButton alloc]
               initWithFrame:rect
           imageTitleSpacing:imageTitleSpacing
             backgroundColor:GetDialogBackgroundColor()]);
-  if (switches::IsMaterialDesignUserMenu())
-    [profileButton setRightMarginSpacing:kHorizontalSpacing];
+  [profileButton setRightMarginSpacing:kHorizontalSpacing];
 
   NSString* title = base::SysUTF16ToNSString(
       profiles::GetProfileSwitcherTextForItem(item));
   [profileButton setTitle:title];
 
   CGFloat availableWidth;
-  if (switches::IsMaterialDesignUserMenu()) {
-    int iconImageSide = 18;
-    [profileButton setDefaultImage:CreateProfileImage(item.icon, iconImageSide,
-                                                      profiles::SHAPE_CIRCLE)];
-    availableWidth = rect.size.width - iconImageSide - imageTitleSpacing -
-                     2 * kHorizontalSpacing;
-  } else {
-    // Use the low-res, small default avatars in the fast user switcher, like
-    // we do in the menu bar.
-    gfx::Image itemIcon;
-    AvatarMenu::GetImageForMenuButton(item.profile_path, &itemIcon);
-    [profileButton setDefaultImage:CreateProfileImage(itemIcon, kSmallImageSide,
-                                                      profiles::SHAPE_SQUARE)];
-    availableWidth = rect.size.width - kSmallImageSide - imageTitleSpacing -
-                     kHorizontalSpacing;
-  }
+  int iconImageSide = 18;

[msarda, 2017/02/23 11:51:02]

Optional nit: Let's make this a constant:
const int kIcontImageSide = 18;

[jlebel, 2017/02/23 18:18:49]

Done.

+  [profileButton setDefaultImage:CreateProfileImage(item.icon, iconImageSide,
+                                                    profiles::SHAPE_CIRCLE)];
+  availableWidth = rect.size.width - iconImageSide - imageTitleSpacing -
+                   2 * kHorizontalSpacing;
 
   [profileButton setImagePosition:NSImageLeft];
   [profileButton setAlignment:NSLeftTextAlignment];
   [profileButton setBordered:NO];
   [profileButton setTag:itemIndex];
   [profileButton setTarget:self];
   [profileButton setAction:@selector(switchToProfile:)];
 
-  NSSize textSize = [[profileButton title] sizeWithAttributes:@{
-    NSFontAttributeName : [profileButton font]
-  }];
-
-  if (!switches::IsMaterialDesignUserMenu() &&
-      std::ceil(textSize.width) > availableWidth)
-    [profileButton setToolTip:[profileButton title]];
-
   return profileButton.autorelease();
 }
 
-- (NSView*)createOptionsViewWithRect:(NSRect)rect
-                         showLock:(BOOL)showLock {
-  NSRect viewRect = NSMakeRect(0, 0,
-                               rect.size.width,
-                               kBlueButtonHeight + kSmallVerticalSpacing);
-  base::scoped_nsobject<NSView> container([[NSView alloc] initWithFrame:rect]);
-
-  if (showLock) {
-    NSButton* lockButton =
-        [self hoverButtonWithRect:viewRect
-                             text:l10n_util::GetNSString(
-                                  IDS_PROFILES_PROFILE_SIGNOUT_BUTTON)
-                  imageResourceId:IDR_ICON_PROFILES_MENU_LOCK
-                           action:@selector(lockProfile:)];
-    [container addSubview:lockButton];
-    viewRect.origin.y = NSMaxY([lockButton frame]);
-
-    NSBox* separator = [self horizontalSeparatorWithFrame:viewRect];
-    [container addSubview:separator];
-    viewRect.origin.y = NSMaxY([separator frame]);
-  }
-
-  if ([self shouldShowGoIncognito]) {
-    NSButton* goIncognitoButton =
-        [self hoverButtonWithRect:viewRect
-                             text:l10n_util::GetNSString(
-                                  IDS_PROFILES_GO_INCOGNITO_BUTTON)
-                  imageResourceId:IDR_ICON_PROFILES_MENU_INCOGNITO
-                           action:@selector(goIncognito:)];
-    viewRect.origin.y = NSMaxY([goIncognitoButton frame]);
-    [container addSubview:goIncognitoButton];
-
-    NSBox* separator = [self horizontalSeparatorWithFrame:viewRect];
-    [container addSubview:separator];
-    viewRect.origin.y = NSMaxY([separator frame]);
-  }
-
-  NSString* text = isGuestSession_ ?
-      l10n_util::GetNSString(IDS_PROFILES_EXIT_GUEST) :
-      l10n_util::GetNSString(IDS_PROFILES_SWITCH_USERS_BUTTON);
-  NSButton* switchUsersButton =
-      [self hoverButtonWithRect:viewRect
-                           text:text
-                imageResourceId:IDR_ICON_PROFILES_MENU_AVATAR
-                         action:isGuestSession_? @selector(exitGuest:) :
-                                                 @selector(showUserManager:)];
-  viewRect.origin.y = NSMaxY([switchUsersButton frame]);
-  [container addSubview:switchUsersButton];
-
-  [container setFrameSize:NSMakeSize(rect.size.width, viewRect.origin.y)];
-  return container.autorelease();
-}
-
 - (NSView*)createCurrentProfileAccountsView:(NSRect)rect {
   const CGFloat kAccountButtonHeight = 34;
 
   const AvatarMenu::Item& item =
       avatarMenu_->GetItemAt(avatarMenu_->GetActiveProfileIndex());
   DCHECK(item.signed_in);
 
   NSColor* backgroundColor = skia::SkColorToCalibratedNSColor(
       profiles::kAvatarBubbleAccountsBackgroundColor);
   base::scoped_nsobject<NSView> container([[BackgroundColorView alloc]
@@ skipping 381 matching lines @@
                                             action:(SEL)action {
   // The vector icons in hover buttons have small embeded paddings and are
   // therefore given an extra 2px in size to have a consistent look as the
   // profile icons; hence the -2.0 here to left align the hover button texts
   // with those of profile buttons.
   const int md_image_title_spacing = kHorizontalSpacing - 2.0;
 
   base::scoped_nsobject<BackgroundColorHoverButton> button(
       [[BackgroundColorHoverButton alloc]
               initWithFrame:rect
-          imageTitleSpacing:switches::IsMaterialDesignUserMenu()
-                                ? md_image_title_spacing
-                                : kImageTitleSpacing
+          imageTitleSpacing:md_image_title_spacing
             backgroundColor:GetDialogBackgroundColor()]);
 
   [button setTitle:text];
   [button setAlignment:NSLeftTextAlignment];
   [button setBordered:NO];
   [button setTarget:self];
   [button setAction:action];
 
   return button.autorelease();
 }
@@ skipping 93 matching lines @@
 
 - (void)showWindow:(id)sender {
   [super showWindow:sender];
   NSEvent *event = [[NSApplication sharedApplication] currentEvent];
   if (firstProfileView_ && [event type] == NSKeyDown) {
     [[self window] makeFirstResponder:firstProfileView_];
   }
 }
 
 @end