[iOS] Remove legacy toolbar button visibility

This CL removes the button visibility of the legacy toolbar which has
been removed in a previous CL.

Bug: 800266
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: I7d847599d4720fa6d5a920baa9b5ad468e6e4d32
Reviewed-on: https://chromium-review.googlesource.com/1236654Reviewed-by: Olivier Robin <olivierrobin@chromium.org>
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593157}

ios/chrome/browser/ui/toolbar/buttons/toolbar_button.mm

@@ -77,15 +77,6 @@ const CGFloat kSpotlightCornerRadius = 7;
                        ToolbarComponentVisibilityRegularWidthRegularHeight);
   }
 
-  if (!IsIPadIdiom() &&
-      self.visibilityMask & ToolbarComponentVisibilityIPhoneOnly) {
-    newHiddenValue = NO;
-  }
-  if (newHiddenValue &&
-      self.visibilityMask & ToolbarComponentVisibilityOnlyWhenEnabled) {
-    newHiddenValue = !self.enabled;
-  }
-
   if (self.hiddenInCurrentSizeClass != newHiddenValue) {
     self.hiddenInCurrentSizeClass = newHiddenValue;
     [self setHiddenForCurrentStateAndSizeClass];

ios/chrome/browser/ui/toolbar/buttons/toolbar_button_visibility_configuration.mm

@@ -29,8 +29,6 @@
              ~ToolbarComponentVisibilitySplit;
     case SECONDARY:
       return ToolbarComponentVisibilitySplit;
-    case LEGACY:
-      return ToolbarComponentVisibilityAlways;
   }
 }
 
@@ -41,9 +39,6 @@
              ~ToolbarComponentVisibilitySplit;
     case SECONDARY:
       return ToolbarComponentVisibilitySplit;
-    case LEGACY:
-      return ToolbarComponentVisibilityOnlyWhenEnabled |
-             ToolbarComponentVisibilityRegularWidthRegularHeight;
   }
 }
 
@@ -54,8 +49,6 @@
              ToolbarComponentVisibilityRegularWidthCompactHeight;
     case SECONDARY:
       return ToolbarComponentVisibilitySplit;
-    case LEGACY:
-      return ToolbarComponentVisibilityIPhoneOnly;
   }
 }
 
@@ -66,8 +59,6 @@
              ~ToolbarComponentVisibilitySplit;
     case SECONDARY:
       return ToolbarComponentVisibilitySplit;
-    case LEGACY:
-      return ToolbarComponentVisibilityAlways;
   }
 }
 
@@ -78,8 +69,6 @@
              ~ToolbarComponentVisibilitySplit;
     case SECONDARY:
       return ToolbarComponentVisibilityNone;
-    case LEGACY:
-      return ToolbarComponentVisibilityRegularWidthRegularHeight;
   }
 }
 
@@ -90,8 +79,6 @@
              ~ToolbarComponentVisibilitySplit;
     case SECONDARY:
       return ToolbarComponentVisibilityNone;
-    case LEGACY:
-      return ToolbarComponentVisibilityRegularWidthRegularHeight;
   }
 }
 
@@ -102,8 +89,6 @@
              ~ToolbarComponentVisibilitySplit;
     case SECONDARY:
       return ToolbarComponentVisibilityNone;
-    case LEGACY:
-      return ToolbarComponentVisibilityRegularWidthRegularHeight;
   }
 }
 
@@ -113,9 +98,6 @@
       return ToolbarComponentVisibilityRegularWidthRegularHeight;
     case SECONDARY:
       return ToolbarComponentVisibilityNone;
-    case LEGACY:
-      return ToolbarComponentVisibilityRegularWidthCompactHeight |
-             ToolbarComponentVisibilityRegularWidthRegularHeight;
   }
 }
 
@@ -125,9 +107,6 @@
       return ToolbarComponentVisibilityRegularWidthRegularHeight;
     case SECONDARY:
       return ToolbarComponentVisibilityNone;
-    case LEGACY:
-      return ToolbarComponentVisibilityRegularWidthCompactHeight |
-             ToolbarComponentVisibilityRegularWidthRegularHeight;
   }
 }
 
@@ -137,8 +116,6 @@
       return ToolbarComponentVisibilityNone;
     case SECONDARY:
       return ToolbarComponentVisibilityNone;
-    case LEGACY:
-      return ToolbarComponentVisibilityAlways;
   }
 }
 
@@ -148,8 +125,6 @@
       return ToolbarComponentVisibilityNone;
     case SECONDARY:
       return ToolbarComponentVisibilitySplit;
-    case LEGACY:
-      return ToolbarComponentVisibilityNone;
   }
 }
 
@@ -159,8 +134,6 @@
       return ToolbarComponentVisibilityAlways;
     case SECONDARY:
       return ToolbarComponentVisibilityNone;
-    case LEGACY:
-      return ToolbarComponentVisibilityAlways;
   }
 }
 

ios/chrome/browser/ui/toolbar/buttons/toolbar_component_options.h

@@ -33,13 +33,6 @@ typedef NS_OPTIONS(NSUInteger, ToolbarComponentVisibility) {
   // split.
   ToolbarComponentVisibilitySplit =
       ToolbarComponentVisibilityCompactWidthRegularHeight,
-  // TODO(crbug.com/800266): Remove this, only used for non-adaptive toolbar.
-  // Use this option when the component should be visible only if it's enabled.
-  // This setting applies only if the other settings don't show the button.
-  ToolbarComponentVisibilityOnlyWhenEnabled = 1 << 4,
-  // TODO(crbug.com/800266): Remove this, only used for non-adaptive toolbar.
-  // Use this option when the component should be always visible on iPhone only.
-  ToolbarComponentVisibilityIPhoneOnly = 1 << 5,
 };
 
 #endif  // IOS_CHROME_BROWSER_UI_TOOLBAR_BUTTONS_TOOLBAR_COMPONENT_OPTIONS_H_

ios/chrome/browser/ui/toolbar/buttons/toolbar_type.h

@@ -11,9 +11,6 @@ typedef NS_ENUM(NSInteger, ToolbarType) {
   PRIMARY = 0,
   // Secondary toolbar.
   SECONDARY = 1,
-  // TODO(crbug.com/800266): Remove this.
-  // Non-adaptive toolbar.
-  LEGACY = 2,
 };
 
 #endif  // IOS_CHROME_BROWSER_UI_TOOLBAR_BUTTONS_TOOLBAR_TYPE_H_