Fix the layout of the append button on Answers in Suggest.

ios/chrome/browser/ui/omnibox/omnibox_popup_material_row.mm

 // Copyright (c) 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 "ios/chrome/browser/ui/omnibox/omnibox_popup_material_row.h"
 
 #include "base/logging.h"
 #include "base/mac/objc_property_releaser.h"
 #import "ios/chrome/browser/ui/omnibox/truncating_attributed_label.h"
 #include "ios/chrome/browser/ui/rtl_geometry.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #include "ios/chrome/grit/ios_theme_resources.h"
 
 namespace {
 const CGFloat kImageDimensionLength = 19.0;
 const CGFloat kLeadingPaddingIpad = 164;
 const CGFloat kLeadingPaddingIpadCompact = 71;
 const CGFloat kAppendButtonTrailingMargin = 4;
+const CGFloat kAppendButtonSize = 48.0;
 }
 
 @interface OmniboxPopupMaterialRow () {
   BOOL _incognito;
   base::mac::ObjCPropertyReleaser _propertyReleaser_OmniboxPopupMaterialRow;
 }
 
 // Set the append button normal and highlighted images.
 - (void)updateAppendButtonImages;
 
@@ skipping 41 matching lines @@
     [self updateAppendButtonImages];
     // TODO(justincohen): Consider using the UITableViewCell's accessory view.
     // The current implementation is from before using a UITableViewCell.
     [self addSubview:_appendButton];
 
     _physicalWebButton = [[UIButton buttonWithType:UIButtonTypeCustom] retain];
     [_physicalWebButton setContentMode:UIViewContentModeRight];
     [self updatePhysicalWebImage];
     [self addSubview:_physicalWebButton];
 
-    // Left icon is only displayed on iPad.
+    // Leading icon is only displayed on iPad.
     if (IsIPadIdiom()) {
       _imageView = [[UIImageView alloc] initWithFrame:CGRectZero];
       _imageView.userInteractionEnabled = NO;
       _imageView.contentMode = UIViewContentModeCenter;
 
       // TODO(justincohen): Consider using the UITableViewCell's image view.
       // The current implementation is from before using a UITableViewCell.
       [self addSubview:_imageView];
     }
 
@@ skipping 11 matching lines @@
 }
 
 - (void)layoutAccessoryViews {
   LayoutRect imageViewLayout = LayoutRectMake(
       IsCompactTablet() ? kLeadingPaddingIpadCompact : kLeadingPaddingIpad,
       CGRectGetWidth(self.bounds),
       floor((_rowHeight - kImageDimensionLength) / 2), kImageDimensionLength,
       kImageDimensionLength);
   _imageView.frame = LayoutRectGetRect(imageViewLayout);
 
-  CGFloat appendButtonDimensionLength = CGRectGetHeight(self.bounds);
-  DCHECK_GT(appendButtonDimensionLength, 40);
-  LayoutRect rightAccessoryLayout =
-      LayoutRectMake(CGRectGetWidth(self.bounds) - appendButtonDimensionLength -
-                         kAppendButtonTrailingMargin,
-                     CGRectGetWidth(self.bounds),
-                     floor((_rowHeight - appendButtonDimensionLength) / 2),
-                     appendButtonDimensionLength, appendButtonDimensionLength);
-  _appendButton.frame = LayoutRectGetRect(rightAccessoryLayout);
-  _physicalWebButton.frame = LayoutRectGetRect(rightAccessoryLayout);
+  LayoutRect trailingAccessoryLayout = LayoutRectMake(
+      CGRectGetWidth(self.bounds) - kAppendButtonSize -
+          kAppendButtonTrailingMargin,
+      CGRectGetWidth(self.bounds), floor((_rowHeight - kAppendButtonSize) / 2),
+      kAppendButtonSize, kAppendButtonSize);
+  _appendButton.frame = LayoutRectGetRect(trailingAccessoryLayout);
+  _physicalWebButton.frame = LayoutRectGetRect(trailingAccessoryLayout);
 }
 
-- (void)updateLeftImage:(int)imageID {
+- (void)updateLeadingImage:(int)imageID {
   _imageView.image = NativeImage(imageID);
 
   // Adjust the vertical position based on the current size of the row.
   CGRect frame = _imageView.frame;
   frame.origin.y = floor((_rowHeight - kImageDimensionLength) / 2);
   _imageView.frame = frame;
 }
 
 - (void)updateHighlightBackground:(BOOL)highlighted {
   // Set the background color to match the color of selected table view cells
@@ skipping 44 matching lines @@
 
 - (NSString*)accessibilityLabel {
   return _textTruncatingLabel.attributedText.string;
 }
 
 - (NSString*)accessibilityValue {
   return _detailTruncatingLabel.attributedText.string;
 }
 
 @end