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

chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm

 // Copyright 2013 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/omnibox/omnibox_popup_cell.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 12 matching lines @@
 #include "components/omnibox/browser/omnibox_popup_model.h"
 #include "components/omnibox/browser/suggestion_answer.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/font.h"
 
 namespace {
 
-// How far to offset image column from the left.
-const CGFloat kImageXOffset = 5.0;
-
 // How far to offset text.
 const CGFloat kVerticalTextPadding = 3.0;
 
 const CGFloat kVerticalImagePadding = 3.0;
 const CGFloat kMaterialVerticalImagePadding = 5.0;
 
 const CGFloat kTextStartOffset = 28.0;
-const CGFloat kMaterialTextStartOffset = 26.0;
+const CGFloat kMaterialTextStartOffset = 27.0;
 
 // Rounding radius of selection and hover background on popup items.
 const CGFloat kCellRoundingRadius = 2.0;
 
 // How far to offset the image.
 CGFloat VerticalImagePadding() {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return kVerticalImagePadding;
   }
   return kMaterialVerticalImagePadding;
 }
 
+// How far to offset the image column from the left.
+CGFloat ImageXOffset() {
+  const CGFloat kImageXOffset = 5.0;
+  const CGFloat kMaterialImageXOffset = 6.0;
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    return kImageXOffset;
+  }
+  return kMaterialImageXOffset;
+}
+
 // How far to offset the text column from the left.
 CGFloat TextStartOffset() {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return kTextStartOffset;
   }
   return kMaterialTextStartOffset;
 }
 
 // Flips the given |rect| in context of the given |frame|.
 NSRect FlipIfRTL(NSRect rect, NSRect frame) {
@@ skipping 437 matching lines @@
       !AutocompleteMatch::IsSearchType([cellData matchType]),
       &contentsMaxWidth,
       &descriptionMaxWidth);
 
   NSWindow* parentWindow = [[controlView window] parentWindow];
   BOOL isDarkTheme = [parentWindow hasDarkTheme];
   NSRect imageRect = cellFrame;
   NSImage* theImage =
       isDarkTheme ? [cellData incognitoImage] : [cellData image];
   imageRect.size = [theImage size];
-  imageRect.origin.x += kImageXOffset + [tableView contentLeftPadding];
+  imageRect.origin.x += ImageXOffset() + [tableView contentLeftPadding];
   imageRect.origin.y += VerticalImagePadding();
   [theImage drawInRect:FlipIfRTL(imageRect, cellFrame)
               fromRect:NSZeroRect
              operation:NSCompositeSourceOver
               fraction:1.0
         respectFlipped:YES
                  hints:nil];
 
   NSPoint origin = NSMakePoint(
       TextStartOffset() + [tableView contentLeftPadding], kVerticalTextPadding);
@@ skipping 178 matching lines @@
   return base::i18n::IsRTL() ? (inputWidth - glyphOffset) : glyphOffset;
 }
 
 + (NSAttributedString*)createSeparatorStringForDarkTheme:(BOOL)isDarkTheme {
   base::string16 raw_separator =
       l10n_util::GetStringUTF16(IDS_AUTOCOMPLETE_MATCH_DESCRIPTION_SEPARATOR);
   return CreateAttributedString(raw_separator, DimTextColor(isDarkTheme));
 }
 
 @end