[ios clean] Toolbar UI improvements.

ios/clean/chrome/browser/ui/toolbar/toolbar_button+factory.mm

 // Copyright 2017 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/clean/chrome/browser/ui/toolbar/toolbar_button+factory.h"
 
 #import "ios/chrome/browser/ui/rtl_geometry.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #include "ios/chrome/grit/ios_theme_resources.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
+namespace {
+// ToolbarButton fixed width.
+CGFloat kToolbarButtonWidth = 42.0f;
+}  // namespace
+
 @implementation ToolbarButton (Factory)
 
 #pragma mark - ToolbarButton Setup
 
 + (instancetype)backToolbarButton {
   ToolbarButton* backButton = [self
       toolbarButtonWithImageForNormalState:NativeReversableImage(
                                                IDR_IOS_TOOLBAR_LIGHT_BACK, YES)
                   imageForHighlightedState:
                       NativeReversableImage(IDR_IOS_TOOLBAR_LIGHT_BACK_PRESSED,
                                             YES)
                      imageForDisabledState:
                          NativeReversableImage(
                              IDR_IOS_TOOLBAR_LIGHT_BACK_DISABLED, YES)];
+  [backButton.widthAnchor constraintEqualToConstant:kToolbarButtonWidth]
+      .active = YES;
   return backButton;
 }
 
 + (instancetype)forwardToolbarButton {
   ToolbarButton* forwardButton = [self
       toolbarButtonWithImageForNormalState:NativeReversableImage(
                                                IDR_IOS_TOOLBAR_LIGHT_FORWARD,
                                                YES)
                   imageForHighlightedState:
                       NativeReversableImage(
                           IDR_IOS_TOOLBAR_LIGHT_FORWARD_PRESSED, YES)
                      imageForDisabledState:
                          NativeReversableImage(
                              IDR_IOS_TOOLBAR_LIGHT_FORWARD_DISABLED, YES)];
+  [forwardButton.widthAnchor constraintEqualToConstant:kToolbarButtonWidth]
+      .active = YES;
   return forwardButton;
 }
 
 + (instancetype)tabSwitcherStripToolbarButton {
-  return [self toolbarButtonWithImageForNormalState:
-                   [UIImage imageNamed:@"tabswitcher_open_tabs"]
-                           imageForHighlightedState:nil
-                              imageForDisabledState:nil];
+  ToolbarButton* tabSwitcherStripButton =
+      [self toolbarButtonWithImageForNormalState:
+                [UIImage imageNamed:@"tabswitcher_open_tabs"]
+                        imageForHighlightedState:nil
+                           imageForDisabledState:nil];
+  [tabSwitcherStripButton.widthAnchor
+      constraintEqualToConstant:kToolbarButtonWidth]
+      .active = YES;
+  return tabSwitcherStripButton;
 }
 
 + (instancetype)tabSwitcherGridToolbarButton {
-  return [self toolbarButtonWithImageForNormalState:
-                   [UIImage imageNamed:@"tabswitcher_tab_switcher_button"]
-                           imageForHighlightedState:nil
-                              imageForDisabledState:nil];
+  ToolbarButton* tabSwitcherGridButton =
+      [self toolbarButtonWithImageForNormalState:
+                [UIImage imageNamed:@"tabswitcher_tab_switcher_button"]
+                        imageForHighlightedState:nil
+                           imageForDisabledState:nil];
+  [tabSwitcherGridButton.widthAnchor
+      constraintEqualToConstant:kToolbarButtonWidth]
+      .active = YES;
+  return tabSwitcherGridButton;
 }
 
 + (instancetype)toolsMenuToolbarButton {
   ToolbarButton* toolsMenuButton = [self
       toolbarButtonWithImageForNormalState:[UIImage
                                                imageNamed:@"tabswitcher_menu"]
                   imageForHighlightedState:nil
                      imageForDisabledState:nil];
   [toolsMenuButton setImageEdgeInsets:UIEdgeInsetsMakeDirected(0, -3, 0, 0)];
+  [toolsMenuButton.widthAnchor constraintEqualToConstant:kToolbarButtonWidth]
+      .active = YES;
   return toolsMenuButton;
 }
 
 + (instancetype)shareToolbarButton {
   ToolbarButton* shareButton = [self
       toolbarButtonWithImageForNormalState:NativeImage(
                                                IDR_IOS_TOOLBAR_LIGHT_SHARE)
                   imageForHighlightedState:
                       NativeImage(IDR_IOS_TOOLBAR_LIGHT_SHARE_PRESSED)
                      imageForDisabledState:
                          NativeImage(IDR_IOS_TOOLBAR_LIGHT_SHARE_DISABLED)];
+  [shareButton.widthAnchor constraintEqualToConstant:kToolbarButtonWidth]
+      .active = YES;
   return shareButton;
 }
 
 + (instancetype)reloadToolbarButton {
   ToolbarButton* reloadButton = [self
       toolbarButtonWithImageForNormalState:NativeReversableImage(
                                                IDR_IOS_TOOLBAR_LIGHT_RELOAD,
                                                YES)
                   imageForHighlightedState:
                       NativeReversableImage(
                           IDR_IOS_TOOLBAR_LIGHT_RELOAD_PRESSED, YES)
                      imageForDisabledState:
                          NativeReversableImage(
                              IDR_IOS_TOOLBAR_LIGHT_RELOAD_DISABLED, YES)];
+  [reloadButton.widthAnchor constraintEqualToConstant:kToolbarButtonWidth]
+      .active = YES;
   return reloadButton;
 }
 
 + (instancetype)stopToolbarButton {
   ToolbarButton* stopButton = [self
       toolbarButtonWithImageForNormalState:NativeImage(
                                                IDR_IOS_TOOLBAR_LIGHT_STOP)
                   imageForHighlightedState:
                       NativeImage(IDR_IOS_TOOLBAR_LIGHT_STOP_PRESSED)
                      imageForDisabledState:
                          NativeImage(IDR_IOS_TOOLBAR_LIGHT_STOP_DISABLED)];
+  [stopButton.widthAnchor constraintEqualToConstant:kToolbarButtonWidth]
+      .active = YES;
   return stopButton;
 }
 
 @end