[Mac] Change the omnibox decoration padding

chrome/browser/ui/cocoa/location_bar/bubble_decoration.mm

 // Copyright (c) 2010 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.
 
 #include <cmath>
 
 #import "chrome/browser/ui/cocoa/location_bar/bubble_decoration.h"
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 namespace {
 
 // This is used to increase the right margin of this decoration.
-const CGFloat kRightSideMargin = 1.0;
+const CGFloat kLeftSidePadding = 6.0;
 
 // Padding between the icon/label and bubble edges.
-const CGFloat kBubblePadding = 8.0;
+const CGFloat kBubblePadding = 7.0;
 
 // Additional padding between the divider and the label.
-const CGFloat kDividerPadding = 2.0;
+const CGFloat kDividerPadding = 6.0;
 
 // Padding between the icon and label.
 const CGFloat kIconLabelPadding = 4.0;
 
-// Inset for the background.
-const CGFloat kBackgroundYInset = 4.0;
+// Inset for the image frame.
+const CGFloat kImageFrameYInset = 4.0;
 
 }  // namespace
 
 BubbleDecoration::BubbleDecoration() : retina_baseline_offset_(0) {
   attributes_.reset([[NSMutableDictionary alloc] init]);
   [attributes_ setObject:LocationBarDecoration::GetFont()
                   forKey:NSFontAttributeName];
 }
 
 BubbleDecoration::~BubbleDecoration() {
@@ skipping 11 matching lines @@
   const CGFloat image_width = image ? [image size].width : 0.0;
   if (!label)
     return kBubblePadding + image_width;
 
   // The bubble needs to take up an integral number of pixels.
   // Generally -sizeWithAttributes: seems to overestimate rather than
   // underestimate, so floor() seems to work better.
   const CGFloat label_width =
       std::floor([label sizeWithAttributes:attributes_].width);
   return kBubblePadding + image_width + kIconLabelPadding + label_width +
-         DividerPadding();
+         DividerPadding() + kLeftSidePadding;
 }
 
 NSRect BubbleDecoration::GetImageRectInFrame(NSRect frame) {
-  NSRect image_rect = NSInsetRect(frame, 0.0, kBackgroundYInset);
+  NSRect image_rect = NSInsetRect(frame, 0.0, kImageFrameYInset);
   if (image_) {
     // Center the image vertically.
     const NSSize image_size = [image_ size];
 
     image_rect.origin.y +=
         std::floor((NSHeight(frame) - image_size.height) / 2.0);
     image_rect.size = image_size;
   }
   return image_rect;
 }
 
 NSColor* BubbleDecoration::GetDarkModeTextColor() {
   return skia::SkColorToSRGBNSColor(kMaterialDarkModeTextColor);
 }
 
 CGFloat BubbleDecoration::GetWidthForSpace(CGFloat width) {
   const CGFloat all_width = GetWidthForImageAndLabel(image_, label_);
   if (all_width <= width)
     return all_width;
 
   const CGFloat image_width = GetWidthForImageAndLabel(image_, nil);
   if (image_width <= width)
     return image_width;
 
   return kOmittedWidth;
 }
 
 void BubbleDecoration::DrawInFrame(NSRect frame, NSView* control_view) {
-  const NSRect decoration_frame = NSInsetRect(frame, 0.0, kBackgroundYInset);
+  const NSRect decoration_frame = NSInsetRect(frame, 0.0, kImageFrameYInset);
   CGFloat text_offset = NSMinX(decoration_frame);
   if (image_) {
     // Center the image vertically.
     const NSSize image_size = [image_ size];
     NSRect image_rect = decoration_frame;
+    image_rect.origin.x += kLeftSidePadding;
     image_rect.origin.y +=
         std::floor((NSHeight(decoration_frame) - image_size.height) / 2.0);
     image_rect.size = image_size;
     [image_ drawInRect:image_rect
               fromRect:NSZeroRect  // Entire image
              operation:NSCompositeSourceOver
               fraction:1.0
         respectFlipped:YES
                  hints:nil];
     text_offset = NSMaxX(image_rect) + kIconLabelPadding;
@@ skipping 25 matching lines @@
     CGFloat line_width = [control_view cr_lineWidth];
     if (line_width < 1) {
       NSAffineTransform* transform = [NSAffineTransform transform];
       [transform translateXBy:0 yBy:retina_baseline_offset_];
       [transform concat];
     }
     DrawLabel(label_, attributes_, text_rect);
   }
 }
 
-void BubbleDecoration::DrawWithBackgroundInFrame(NSRect background_frame,
-                                                 NSRect frame,
-                                                 NSView* control_view) {
-  NSRect rect = NSInsetRect(background_frame, 0, 1);
-  rect.size.width -= kRightSideMargin;
-  DrawInFrame(frame, control_view);
-}
-
 NSFont* BubbleDecoration::GetFont() const {
   return [attributes_ objectForKey:NSFontAttributeName];
 }
 
 NSImage* BubbleDecoration::GetImage() {
   return image_;
 }
 
 void BubbleDecoration::SetImage(NSImage* image) {
   image_.reset([image retain]);
@@ skipping 11 matching lines @@
   [attributes_ setObject:text_color forKey:NSForegroundColorAttributeName];
 }
 
 void BubbleDecoration::SetFont(NSFont* font) {
   [attributes_ setObject:font forKey:NSFontAttributeName];
 }
 
 void BubbleDecoration::SetRetinaBaselineOffset(CGFloat offset) {
   retina_baseline_offset_ = offset;
 }