Remove toggle button code from Tab Strip.

ios/chrome/browser/ui/tabs/tab_strip_controller.mm

 // Copyright 2012 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 "ios/chrome/browser/ui/tabs/tab_strip_controller.h"
 #import "ios/chrome/browser/ui/tabs/tab_strip_controller_private.h"
 
 #include <cmath>
 #include <vector>
 
@@ skipping 54 matching lines @@
 const NSTimeInterval kDragAndDropLongPressDuration = 0.4;
 
 // Tab dimensions.
 const CGFloat kTabOverlap = 26.0;
 const CGFloat kTabOverlapForCompactLayout = 30.0;
 
 const CGFloat kNewTabOverlap = 8.0;
 const CGFloat kMaxTabWidth = 265.0;
 const CGFloat kMaxTabWidthForCompactLayout = 225.0;
 
-// Toggle button dimensions.
-const CGFloat kModeToggleButtonWidth = 36.0;
-const CGFloat kTabSwitcherToggleButtonWidth = 46.0;
-const CGFloat kModeToggleButtonBackgroundWidth = 62.0;
+// Tab Switcher button dimensions.
+const CGFloat kTabSwitcherButtonWidth = 46.0;
+const CGFloat kTabSwitcherButtonBackgroundWidth = 62.0;
 
 const CGFloat kNewTabRightPadding = 4.0;
 const CGFloat kMinTabWidth = 200.0;
 const CGFloat kMinTabWidthForCompactLayout = 160.0;
 
 const CGFloat kCollapsedTabOverlap = 5.0;
 const NSUInteger kMaxNumCollapsedTabs = 3;
 const NSUInteger kMaxNumCollapsedTabsForCompactLayout = 0;
 
 // Tabs with a visible width smaller than this draw as collapsed tabs..
@@ skipping 27 matching lines @@
 }
 
 @interface TabStripController ()<TabModelObserver,
                                  TabStripViewLayoutDelegate,
                                  UIGestureRecognizerDelegate,
                                  UIScrollViewDelegate> {
   base::scoped_nsobject<TabModel> _tabModel;
   UIView* _view;
   TabStripView* _tabStripView;
   UIButton* _buttonNewTab;
-  // TODO(crbug.com/687132): Remove toggle button.
-  UIButton* _modeToggleButton;         // weak, nil if not visible.
-  UIButton* _tabSwitcherToggleButton;  // weak, nil if not visible.
+  base::scoped_nsobject<UIButton> _tabSwitcherButton;
 
-  // Background view of the toggle button. Only visible while in compact layout.
-  base::scoped_nsobject<UIImageView> _toggleButtonBackgroundView;
+  // Background view of the tab switcher button. Only visible while in compact
+  // layout.
+  base::scoped_nsobject<UIImageView> _tabSwitcherButtonBackgroundView;
 
   TabStrip::Style _style;
   base::WeakNSProtocol<id<FullScreenControllerDelegate>> _fullscreenDelegate;
 
   // Array of TabViews.  There is a one-to-one correspondence between this array
   // and the set of Tabs in the TabModel.
   base::scoped_nsobject<NSMutableArray> _tabArray;
 
   // Set of TabViews that are currently closing.  These TabViews are also in
   // |_tabArray|.  Used to translate between |_tabArray| indexes and TabModel
@@ skipping 37 matching lines @@
   NSTimer* _autoscrollTimer;  // weak
 
   // The distance to scroll for each autoscroll timer tick.  If negative, the
   // tabstrip will scroll to the left; if positive, to the right.
   CGFloat _autoscrollDistance;
 
   // The model index of the placeholder gap, if one exists.  This value is used
   // as the new model index of the dragged tab when it is dropped.
   NSUInteger _placeholderGapModelIndex;
 
-  // If YES, display the mode toggle switch at the left side of the strip. Can
-  // be set after creation.
-  BOOL _hasModeToggleSwitch;
-
-  // If YES, display the tab switcher toggle switch at the left side of the
-  // strip. Can be set after creation.
-  BOOL _hasTabSwitcherToggleSwitch;
-
   base::mac::ObjCPropertyReleaser _propertyReleaser_TabStripController;
 }
 
 @property(nonatomic, readonly, retain) TabStripView* tabStripView;
 @property(nonatomic, readonly, retain) UIButton* buttonNewTab;
-@property(nonatomic, readonly, assign) UIButton* tabSwitcherToggleButton;
 
 // Initializes the tab array based on the the entries in the TabModel.  Creates
 // one TabView per Tab and adds it to the tabstrip.  A later call to
 // |-layoutTabs| is needed to properly place the tabs in the correct positions.
 - (void)initializeTabArrayFromTabModel;
 
 // Initializes the tab array to have only one empty tab, for the case (used
 // during startup) when there is not a tab model available.
 - (void)initializeTabArrayWithNoModel;
 
-// Add and remove the mode toggle icon and adjusts the size of the scroll view
-// accordingly. Assumes incognito style has already been checked.
-- (void)installModeToggleButton;
-- (void)removeModeToggleButton;
-
-// Add and remove the tab switcher toggle icon and adjusts the size of the
-// scroll view accordingly. The tab switcher toggle button is replacing the
-// incognito mode toggle button.
-// TODO:(jbbegue) crbug/477676 Remove reference to the incognito toggle button
-// once we know for sure that it will be replaced by the tab switcher toggle
-// button.
-- (void)installTabSwitcherToggleButton;
-- (void)removeTabSwitcherToggleButton;
-
 // Returns an autoreleased TabView object with no content.
 - (TabView*)emptyTabView;
 
 // Returns an autoreleased TabView object based on the given Tab.
 // |isSelected| is passed in here as an optimization, so that the TabView is
 // drawn correctly the first time, without requiring the model to send a
 // -setSelected message to the TabView.
 - (TabView*)tabViewForTab:(Tab*)tab isSelected:(BOOL)isSelected;
 
 // Creates and installs the view used to dim unselected tabs.  Does nothing if
@@ skipping 41 matching lines @@
 
 #if 0
 // Returns the appropriate model index for the currently dragged tab, given its
 // current position.  (If dropped, the tab would be at this index in the model.)
 // TODO(rohitrao): Implement this method.
 - (NSUInteger)modelIndexForDraggedTab;
 #endif
 
 // Returns the horizontal visible tab strip width used to compute the tab width
 // and the tabs and new tab button in regular layout mode.
-// Takes into account whether or not the mode toggle button is showing.
 - (CGFloat)tabStripVisibleSpace;
 
 // Shift all of the tab strip subviews by an amount equal to the content offset
 // change, which effectively places the subviews back where they were before the
 // change, in terms of screen coordinates.
 - (void)shiftTabStripSubviews:(CGPoint)oldContentOffset;
 
 // Updates the scroll view's content size based on the current set of tabs and
 // closing tabs.  After updating the content size, repositions views so they
 // they will appear stationary on screen.
@@ skipping 32 matching lines @@
 // Updates the content offset of the tab strip view in order to keep the
 // selected tab view visible.
 // Content offset adjustement is only needed/performed in compact mode or
 // regular mode for newly opened tabs.
 // This method must be called with a valid |tabIndex|.
 - (void)updateContentOffsetForTabIndex:(NSUInteger)tabIndex
                               isNewTab:(BOOL)isNewTab;
 
 // Update the frame of the tab strip view (scrollview) frame, content inset and
 // toggle buttons states depending on the current layout mode.
-- (void)updateScrollViewFrameForToggleButton;
+- (void)updateScrollViewFrameForTabSwitcherButton;
 
 @end
 
 @implementation TabStripController
 
 @synthesize buttonNewTab = _buttonNewTab;
-@synthesize hasModeToggleSwitch = _hasModeToggleSwitch;
-@synthesize hasTabSwitcherToggleSwitch = _hasTabSwitcherToggleSwitch;
 @synthesize highlightsSelectedTab = _highlightsSelectedTab;
-@synthesize modeToggleButton = _modeToggleButton;
 @synthesize tabStripView = _tabStripView;
-@synthesize tabSwitcherToggleButton = _tabSwitcherToggleButton;
 @synthesize view = _view;
 
 - (instancetype)initWithTabModel:(TabModel*)tabModel
                            style:(TabStrip::Style)style {
   if ((self = [super init])) {
     _propertyReleaser_TabStripController.Init(self, [TabStripController class]);
     _tabArray.reset([[NSMutableArray alloc] initWithCapacity:10]);
     _closingTabs.reset([[NSMutableSet alloc] initWithCapacity:5]);
 
     _tabModel.reset([tabModel retain]);
     [_tabModel addObserver:self];
     _style = style;
-    _hasModeToggleSwitch = NO;
-    _hasTabSwitcherToggleSwitch = NO;
 
     // |self.view| setup.
     CGRect tabStripFrame = [UIApplication sharedApplication].keyWindow.bounds;
     tabStripFrame.size.height = kTabStripHeight;
     _view = [[UIView alloc] initWithFrame:tabStripFrame];
     _view.autoresizingMask = (UIViewAutoresizingFlexibleWidth |
                               UIViewAutoresizingFlexibleBottomMargin);
     _view.backgroundColor = TabStrip::BackgroundColor();
     if (UseRTLLayout())
       _view.transform = CGAffineTransformMakeScale(-1, 1);
@@ skipping 52 matching lines @@
     // Use a nil target to send |-chromeExecuteCommand:| down the responder
     // chain.
     [_buttonNewTab addTarget:nil
                       action:@selector(chromeExecuteCommand:)
             forControlEvents:UIControlEventTouchUpInside];
     [_buttonNewTab addTarget:self
                       action:@selector(recordUserMetrics:)
             forControlEvents:UIControlEventTouchUpInside];
     [_tabStripView addSubview:_buttonNewTab];
 
+    [self installTabSwitcherButton];
+
     // Add tab buttons to tab strip.
     if (_tabModel)
       [self initializeTabArrayFromTabModel];
     else
       [self initializeTabArrayWithNoModel];
 
     // Update the layout of the tab buttons.
     [self updateContentSizeAndRepositionViews];
     [self layoutTabStripSubviews];
 
@@ skipping 36 matching lines @@
 
 - (void)initializeTabArrayWithNoModel {
   DCHECK(!_tabModel);
   TabView* view = [self emptyTabView];
   [_tabArray addObject:view];
   [_tabStripView addSubview:view];
   [view setSelected:YES];
   return;
 }
 
-- (void)setHasModeToggleSwitch:(BOOL)hasModeToggleSwitch {
-  if (_hasModeToggleSwitch && !hasModeToggleSwitch)
-    [self removeModeToggleButton];
-  if (!_hasModeToggleSwitch && hasModeToggleSwitch)
-    [self installModeToggleButton];
-  if (_hasModeToggleSwitch != hasModeToggleSwitch) {
-    _hasModeToggleSwitch = hasModeToggleSwitch;
-    [self updateContentSizeAndRepositionViews];
-    [self setNeedsLayoutWithAnimation];
-  }
-}
-
-- (void)setHasTabSwitcherToggleSwitch:(BOOL)hasTabSwitcherToggleSwitch {
-  if (_hasTabSwitcherToggleSwitch && !hasTabSwitcherToggleSwitch)
-    [self removeTabSwitcherToggleButton];
-  if (!_hasTabSwitcherToggleSwitch && hasTabSwitcherToggleSwitch)
-    [self installTabSwitcherToggleButton];
-  if (_hasTabSwitcherToggleSwitch != hasTabSwitcherToggleSwitch) {
-    _hasTabSwitcherToggleSwitch = hasTabSwitcherToggleSwitch;
-    [self updateContentSizeAndRepositionViews];
-    [self setNeedsLayoutWithAnimation];
-  }
-}
-
 - (TabView*)emptyTabView {
   TabView* view =
       [[[TabView alloc] initWithEmptyView:YES selected:YES] autorelease];
   [view setIncognitoStyle:(_style == TabStrip::kStyleIncognito)];
   [view setContentMode:UIViewContentModeRedraw];
 
   // Setting the tab to be hidden marks it as a new tab.  The layout code will
   // make the tab visible and set up the appropriate animations.
   [view setHidden:YES];
 
@@ skipping 93 matching lines @@
             [_dimmingView removeFromSuperview];
             _dimmingView.reset();
           }
         }];
   }
 }
 
 - (void)recordUserMetrics:(id)sender {
   if (sender == _buttonNewTab)
     base::RecordAction(UserMetricsAction("MobileTabStripNewTab"));
-  else if (sender == _modeToggleButton)
-    base::RecordAction(UserMetricsAction("MobileTabStripSwitchMode"));
-  else if (sender == _tabSwitcherToggleButton)
+  else if (sender == _tabSwitcherButton.get())
     base::RecordAction(UserMetricsAction("MobileTabSwitcherOpen"));
   else
     LOG(WARNING) << "Trying to record metrics for unknown sender "
                  << base::SysNSStringToUTF8([sender description]);
 }
 
 - (void)tabTapped:(id)sender {
   DCHECK([sender isKindOfClass:[TabView class]]);
 
   // Ignore taps while in reordering mode.
@@ skipping 414 matching lines @@
           withTab:(Tab*)newTab
           atIndex:(NSUInteger)index {
   // TabViews do not hold references to their parent Tabs, so it's safe to treat
   // this as a tab change rather than a tab replace.
   [self tabModel:model didChangeTab:newTab];
 }
 
 #pragma mark -
 #pragma mark Views and Layout
 
-- (void)installModeToggleButton {
-  // Add the mode toggle button view.
-  DCHECK(!_modeToggleButton);
-  UIImage* toggleIcon = nil;
-  int toggleIdsAccessibilityLabel;
-  NSString* toggleEnglishUiAutomationName;
-  if (_style == TabStrip::kStyleDark) {
-    toggleIcon = [UIImage imageNamed:@"tabstrip_switch"];
-    toggleIdsAccessibilityLabel = IDS_IOS_SWITCH_BROWSER_MODE_ENTER_INCOGNITO;
-    toggleEnglishUiAutomationName = @"Enter Incognito* Mode";
-  } else {
-    toggleIcon = [UIImage imageNamed:@"tabstrip_incognito_switch"];
-    toggleIdsAccessibilityLabel = IDS_IOS_SWITCH_BROWSER_MODE_LEAVE_INCOGNITO;
-    toggleEnglishUiAutomationName = @"Leave Incognito* Mode";
-  }
-  const CGFloat tabStripHeight = _view.frame.size.height;
-  CGRect buttonFrame =
-      CGRectMake(CGRectGetMaxX(_view.frame) - kModeToggleButtonWidth, 0.0,
-                 kModeToggleButtonWidth, tabStripHeight);
-  _modeToggleButton = [UIButton buttonWithType:UIButtonTypeCustom];
-  _modeToggleButton.frame = buttonFrame;
-  [_modeToggleButton setImageEdgeInsets:UIEdgeInsetsMake(7, 5, 7, 5)];
-  _modeToggleButton.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin;
-  _modeToggleButton.backgroundColor = [UIColor clearColor];
-  [_modeToggleButton setImage:toggleIcon forState:UIControlStateNormal];
-  // Set target/action to bubble up with command id as tag.
-  [_modeToggleButton addTarget:nil
-                        action:@selector(chromeExecuteCommand:)
-              forControlEvents:UIControlEventTouchUpInside];
-  [_modeToggleButton addTarget:self
-                        action:@selector(recordUserMetrics:)
-              forControlEvents:UIControlEventTouchUpInside];
-
-  SetA11yLabelAndUiAutomationName(_modeToggleButton,
-                                  toggleIdsAccessibilityLabel,
-                                  toggleEnglishUiAutomationName);
-  [_view addSubview:_modeToggleButton];
-  // Shrink the scroll view.
-  [self updateScrollViewFrameForToggleButton];
-}
-
-- (void)removeModeToggleButton {
-  // Remove the button view.
-  DCHECK(_modeToggleButton);
-  [_modeToggleButton removeFromSuperview];
-  _modeToggleButton = nil;
-  // Extend the scroll view.
-  [self updateScrollViewFrameForToggleButton];
-}
-
 - (CGFloat)tabStripVisibleSpace {
   CGFloat availableSpace = CGRectGetWidth([_tabStripView bounds]) -
                            CGRectGetWidth([_buttonNewTab frame]) +
-                           kNewTabOverlap;
-  if (IsCompactTablet()) {
-    if ([self hasModeToggleSwitch])
-      availableSpace -= kNewTabRightPadding + kModeToggleButtonWidth;
-    else
-      availableSpace -= kNewTabRightPadding;
-  } else {
-    if (![self hasModeToggleSwitch])
-      availableSpace -= kNewTabRightPadding;
-  }
+                           kNewTabOverlap - kNewTabRightPadding -
+                           kTabSwitcherButtonWidth;
   return availableSpace;
 }
 
-- (void)installTabSwitcherToggleButton {
-  // Add the mode toggle button view.
-  DCHECK(!_tabSwitcherToggleButton);
-  UIImage* tabSwitcherToggleIcon =
+- (void)installTabSwitcherButton {
+  DCHECK(!_tabSwitcherButton);
+  UIImage* tabSwitcherButtonIcon =
       [UIImage imageNamed:@"tabswitcher_tab_switcher_button"];
-  tabSwitcherToggleIcon = [tabSwitcherToggleIcon
+  tabSwitcherButtonIcon = [tabSwitcherButtonIcon
       imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
-  int tabSwitcherToggleIdsAccessibilityLabel =
+  int tabSwitcherButtonIdsAccessibilityLabel =
       IDS_IOS_TAB_STRIP_ENTER_TAB_SWITCHER;
-  NSString* tabSwitcherToggleEnglishUiAutomationName = @"Enter Tab Switcher";
+  NSString* tabSwitcherButtonEnglishUiAutomationName = @"Enter Tab Switcher";
   const CGFloat tabStripHeight = _view.frame.size.height;
   CGRect buttonFrame =
-      CGRectMake(CGRectGetMaxX(_view.frame) - kTabSwitcherToggleButtonWidth,
-                 0.0, kTabSwitcherToggleButtonWidth, tabStripHeight);
-  _tabSwitcherToggleButton = [UIButton buttonWithType:UIButtonTypeCustom];
-  [_tabSwitcherToggleButton setTintColor:[UIColor whiteColor]];
-  _tabSwitcherToggleButton.frame = buttonFrame;
-  [_tabSwitcherToggleButton setContentMode:UIViewContentModeCenter];
-  _tabSwitcherToggleButton.autoresizingMask =
-      UIViewAutoresizingFlexibleLeftMargin;
-  _tabSwitcherToggleButton.backgroundColor = [UIColor clearColor];
-  _tabSwitcherToggleButton.exclusiveTouch = YES;
-  [_tabSwitcherToggleButton setImage:tabSwitcherToggleIcon
-                            forState:UIControlStateNormal];
+      CGRectMake(CGRectGetMaxX(_view.frame) - kTabSwitcherButtonWidth, 0.0,
+                 kTabSwitcherButtonWidth, tabStripHeight);
+  _tabSwitcherButton.reset(
+      [[UIButton buttonWithType:UIButtonTypeCustom] retain]);
+  [_tabSwitcherButton setTintColor:[UIColor whiteColor]];
+  [_tabSwitcherButton setFrame:buttonFrame];
+  [_tabSwitcherButton setContentMode:UIViewContentModeCenter];
+  [_tabSwitcherButton setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
+  [_tabSwitcherButton setBackgroundColor:[UIColor clearColor]];
+  [_tabSwitcherButton setExclusiveTouch:YES];
+  [_tabSwitcherButton setImage:tabSwitcherButtonIcon
+                      forState:UIControlStateNormal];
   // Set target/action to bubble up with command id as tag.
-  [_tabSwitcherToggleButton addTarget:nil
-                               action:@selector(chromeExecuteCommand:)
-                     forControlEvents:UIControlEventTouchUpInside];
-  [_tabSwitcherToggleButton setTag:IDC_TOGGLE_TAB_SWITCHER];
-  [_tabSwitcherToggleButton addTarget:self
-                               action:@selector(recordUserMetrics:)
-                     forControlEvents:UIControlEventTouchUpInside];
+  [_tabSwitcherButton addTarget:nil
+                         action:@selector(chromeExecuteCommand:)
+               forControlEvents:UIControlEventTouchUpInside];
+  [_tabSwitcherButton setTag:IDC_TOGGLE_TAB_SWITCHER];
+  [_tabSwitcherButton addTarget:self
+                         action:@selector(recordUserMetrics:)
+               forControlEvents:UIControlEventTouchUpInside];
 
-  SetA11yLabelAndUiAutomationName(_tabSwitcherToggleButton,
-                                  tabSwitcherToggleIdsAccessibilityLabel,
-                                  tabSwitcherToggleEnglishUiAutomationName);
-  [_view addSubview:_tabSwitcherToggleButton];
+  SetA11yLabelAndUiAutomationName(_tabSwitcherButton,
+                                  tabSwitcherButtonIdsAccessibilityLabel,
+                                  tabSwitcherButtonEnglishUiAutomationName);
+  [_view addSubview:_tabSwitcherButton];
   // Shrink the scroll view.
-  [self updateScrollViewFrameForToggleButton];
-}
-
-- (void)removeTabSwitcherToggleButton {
-  // Remove the button view.
-  DCHECK(_tabSwitcherToggleButton);
-  [_tabSwitcherToggleButton removeFromSuperview];
-  _tabSwitcherToggleButton = nil;
-  // Extend the scroll view.
-  [self updateScrollViewFrameForToggleButton];
+  [self updateScrollViewFrameForTabSwitcherButton];
 }
 
 - (void)shiftTabStripSubviews:(CGPoint)oldContentOffset {
   CGFloat dx = [_tabStripView contentOffset].x - oldContentOffset.x;
   for (UIView* view in [_tabStripView subviews]) {
     CGRect frame = [view frame];
     frame.origin.x += dx;
     [view setFrame:frame];
     _targetFrames.AddFrame(view, frame);
   }
@@ skipping 145 matching lines @@
     } else {
       TabView* tabView = [_tabArray objectAtIndex:tabIndex];
       CGRect scrollRect =
           CGRectInset(tabView.frame, -_tabStripView.contentInset.right, 0);
       if (tabView)
         [_tabStripView scrollRectToVisible:scrollRect animated:YES];
     }
   }
 }
 
-- (void)updateScrollViewFrameForToggleButton {
+- (void)updateScrollViewFrameForTabSwitcherButton {
   CGRect tabFrame = _tabStripView.frame;
   tabFrame.size.width = _view.bounds.size.width;
   if (!IsCompactTablet()) {
-    if (_modeToggleButton)
-      tabFrame.size.width -= kModeToggleButtonWidth;
-    if (_tabSwitcherToggleButton)
-      tabFrame.size.width -= kTabSwitcherToggleButtonWidth;
+    tabFrame.size.width -= kTabSwitcherButtonWidth;
     _tabStripView.contentInset = UIEdgeInsetsZero;
-    [_toggleButtonBackgroundView setHidden:YES];
+    [_tabSwitcherButtonBackgroundView setHidden:YES];
   } else {
-    if (!_toggleButtonBackgroundView) {
-      _toggleButtonBackgroundView.reset([[UIImageView alloc] init]);
+    if (!_tabSwitcherButtonBackgroundView) {
+      _tabSwitcherButtonBackgroundView.reset([[UIImageView alloc] init]);
       const CGFloat tabStripHeight = _view.frame.size.height;
       const CGRect backgroundViewFrame = CGRectMake(
-          CGRectGetMaxX(_view.frame) - kModeToggleButtonBackgroundWidth, 0.0,
-          kModeToggleButtonBackgroundWidth, tabStripHeight);
-      [_toggleButtonBackgroundView setFrame:backgroundViewFrame];
-      [_toggleButtonBackgroundView
+          CGRectGetMaxX(_view.frame) - kTabSwitcherButtonBackgroundWidth, 0.0,
+          kTabSwitcherButtonBackgroundWidth, tabStripHeight);
+      [_tabSwitcherButtonBackgroundView setFrame:backgroundViewFrame];
+      [_tabSwitcherButtonBackgroundView
           setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
-      UIImage* backgroundToggleImage =
+      UIImage* backgroundTabSwitcherImage =
           [UIImage imageNamed:@"tabstrip_toggle_button_gradient"];
-      [_toggleButtonBackgroundView setImage:backgroundToggleImage];
-      [_view addSubview:_toggleButtonBackgroundView];
+      [_tabSwitcherButtonBackgroundView setImage:backgroundTabSwitcherImage];
+      [_view addSubview:_tabSwitcherButtonBackgroundView];
     }
-    const BOOL hasModeToggleButton =
-        _modeToggleButton || _tabSwitcherToggleButton;
-    [_toggleButtonBackgroundView setHidden:!hasModeToggleButton];
-    if (!hasModeToggleButton)
-      _tabStripView.contentInset = UIEdgeInsetsZero;
-    if (_modeToggleButton) {
-      _tabStripView.contentInset =
-          UIEdgeInsetsMake(0, 0, 0, kModeToggleButtonWidth);
-      [_view bringSubviewToFront:_modeToggleButton];
-    }
-    if (_tabSwitcherToggleButton) {
-      _tabStripView.contentInset =
-          UIEdgeInsetsMake(0, 0, 0, kTabSwitcherToggleButtonWidth);
-      [_view bringSubviewToFront:_tabSwitcherToggleButton];
-    }
+    [_tabSwitcherButtonBackgroundView setHidden:NO];
+    _tabStripView.contentInset =
+        UIEdgeInsetsMake(0, 0, 0, kTabSwitcherButtonWidth);
+    [_view bringSubviewToFront:_tabSwitcherButton];
   }
   [_tabStripView setFrame:tabFrame];
 }
 
 #pragma mark - TabStripViewLayoutDelegate
 
 // Creates TabViews for each Tab in the TabModel and positions them in the
 // correct location onscreen.
 - (void)layoutTabStripSubviews {
   const NSUInteger tabCount = [_tabArray count] - [_closingTabs count];
@@ skipping 266 matching lines @@
                          [view setFrame:_targetFrames.GetFrame(view)];
                        }
                        if (moveNewTab)
                          [_buttonNewTab setFrame:newTabFrame];
                      }
                      completion:nil];
   }
 }
 
 - (void)traitCollectionDidChange:(UITraitCollection*)previousTraitCollection {
-  [self updateScrollViewFrameForToggleButton];
+  [self updateScrollViewFrameForTabSwitcherButton];
   [self updateContentSizeAndRepositionViews];
   NSUInteger selectedModelIndex = [_tabModel indexOfTab:[_tabModel currentTab]];
   if (selectedModelIndex != NSNotFound) {
     [self updateContentOffsetForTabIndex:selectedModelIndex isNewTab:NO];
   }
 }
 
 - (void)setNeedsLayoutWithAnimation {
   _animateLayout = YES;
   [_tabStripView setNeedsLayout];
@@ skipping 44 matching lines @@
 
 @implementation TabStripController (Testing)
 
 - (TabView*)existingTabViewForTab:(Tab*)tab {
   NSUInteger tabIndex = [_tabModel indexOfTab:tab];
   NSUInteger tabViewIndex = [self indexForModelIndex:tabIndex];
   return [_tabArray objectAtIndex:tabViewIndex];
 }
 
 @end