[Material][Mac] Adjustments to the Omnibox decorations

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"
 
 namespace {
 
 // This is used to increase the right margin of this decoration.
 const CGFloat kRightSideMargin = 1.0;
 
 // Padding between the icon/label and bubble edges.
 CGFloat BubblePadding() {
   return ui::MaterialDesignController::IsModeMaterial() ? 8.0 : 3.0;
 }
 
 // Additional padding between the divider between the omnibox text and the
 // divider. The desired value is 8px. We get 3px by subtracting the existing
 // padding in location_bar_view from 8px.
 CGFloat DividerPadding() {
-  return ui::MaterialDesignController::IsModeMaterial() ? 3.0 : 0.0;
+  return ui::MaterialDesignController::IsModeMaterial() ? 2.0 : 0.0;
 }
 
 // Padding between the icon and label.
-const CGFloat kIconLabelPadding = 4.0;
+CGFloat kIconLabelPadding = 4.0;
 
 // Inset for the background.
 const CGFloat kBackgroundYInset = 4.0;
 
 }  // namespace
 
 BubbleDecoration::BubbleDecoration() : baseline_offset_(0) {
   attributes_.reset([[NSMutableDictionary alloc] init]);
   [attributes_ setObject:LocationBarDecoration::GetFont()
                   forKey:NSFontAttributeName];
@@ skipping 18 matching lines @@
       std::floor([label sizeWithAttributes:attributes_].width);
   return BubblePadding() + image_width + kIconLabelPadding + label_width +
          DividerPadding();
 }
 
 NSRect BubbleDecoration::GetImageRectInFrame(NSRect frame) {
   NSRect imageRect = NSInsetRect(frame, 0.0, kBackgroundYInset);
   if (image_) {
     // Center the image vertically.
     const NSSize imageSize = [image_ size];
+
     imageRect.origin.y +=
         std::floor((NSHeight(frame) - imageSize.height) / 2.0);
     imageRect.size = imageSize;
   }
   return imageRect;
 }
 
 CGFloat BubbleDecoration::GetWidthForSpace(CGFloat width) {
   const CGFloat all_width = GetWidthForImageAndLabel(image_, label_);
   if (all_width <= width)
@@ skipping 91 matching lines @@
   [attributes_ setObject:text_color forKey:NSForegroundColorAttributeName];
 }
 
 void BubbleDecoration::SetFont(NSFont* font) {
   [attributes_ setObject:font forKey:NSFontAttributeName];
 }
 
 void BubbleDecoration::SetBaselineOffset(CGFloat offset) {
   baseline_offset_ = offset;
 }