[Material][Mac]Move the Omnibox left icons 1px to the right

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

 // Copyright (c) 2012 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 "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
@@ skipping 13 matching lines @@
 
 using extensions::FeatureSwitch;
 
 namespace {
 
 // Matches the clipping radius of |GradientButtonCell|.
 const CGFloat kCornerRadius = 3.0;
 
 // How far to inset the left- and right-hand decorations from the field's
 // bounds.
-const CGFloat kLeftDecorationXOffset = 5.0;
 const CGFloat kRightDecorationXOffset = 5.0;
+CGFloat LeftDecorationXOffset() {
+  const CGFloat kLeftDecorationXOffset = 5.0;
+  const CGFloat kLeftMaterialDecorationXOffset = 6.0;
+  return ui::MaterialDesignController::IsModeMaterial()
+             ? kLeftMaterialDecorationXOffset
+             : kLeftDecorationXOffset;
+}
 
 // The amount of padding on either side reserved for drawing
 // decorations.  [Views has |kItemPadding| == 3.]
 CGFloat DecorationsHorizontalPad() {
   const CGFloat kDecorationHorizontalPad = 3.0;
   const CGFloat kMaterialDecorationHorizontalPad = 4.0;
   return ui::MaterialDesignController::IsModeMaterial()
       ? kMaterialDecorationHorizontalPad
       : kDecorationHorizontalPad;
 }
@@ skipping 88 matching lines @@
     const std::vector<LocationBarDecoration*>& left_decorations,
     const std::vector<LocationBarDecoration*>& right_decorations,
     std::vector<LocationBarDecoration*>* decorations,
     std::vector<NSRect>* decoration_frames,
     NSRect* remaining_frame) {
   decorations->clear();
   decoration_frames->clear();
 
   // Layout |left_decorations| against the LHS.
   CalculatePositionsHelper(frame, left_decorations, NSMinXEdge,
-                           kLeftDecorationXOffset, decorations,
+                           LeftDecorationXOffset(), decorations,
                            decoration_frames, &frame);
   DCHECK_EQ(decorations->size(), decoration_frames->size());
 
   // Capture the number of visible left-hand decorations.
   const size_t left_count = decorations->size();
 
   // Layout |right_decorations| against the RHS.
   CalculatePositionsHelper(frame, right_decorations, NSMaxXEdge,
                            kRightDecorationXOffset, decorations,
                            decoration_frames, &frame);
@@ skipping 619 matching lines @@
 
 - (void)handleFocusEvent:(NSEvent*)event
                   ofView:(AutocompleteTextField*)controlView {
   if ([controlView observer]) {
     const bool controlDown = ([event modifierFlags] & NSControlKeyMask) != 0;
     [controlView observer]->OnSetFocus(controlDown);
   }
 }
 
 @end