[Mac][Material Design] Adjust (i) and lock Omnibox icons.

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;
 
 // Padding between the icon/label and bubble edges.
 CGFloat BubblePadding() {
   return ui::MaterialDesignController::IsModeMaterial() ? 8.0 : 3.0;
 }
@@ skipping 100 matching lines @@
     NSColor* text_color =
         in_dark_mode
             ? skia::SkColorToSRGBNSColor(kMaterialDarkModeTextColor)
             : GetBackgroundBorderColor();
     SetTextColor(text_color);
   }
 
   if (label_) {
     NSRect textRect = frame;
     textRect.origin.x = textOffset;
-    textRect.origin.y += baseline_offset_;
     textRect.size.width = NSMaxX(decoration_frame) - NSMinX(textRect);
+    // Transform the coordinate system to adjust the baseline. This is the only
+    // way to get fractional adjustments.
+    gfx::ScopedNSGraphicsContextSaveGState saveGraphicsState;
+    if (baseline_offset_) {

[tapted, 2016/06/22 05:40:38]

Nothing currently calls SetBaselineOffset -- you could probably rename it to
"SetRetinaBaselineOffset, and check [[[control_view] window] backingScaleFactor]
 (see later comment for context)

[shrike, 2016/06/22 21:44:50]

Acknowledged.

+      NSAffineTransform* transform = [NSAffineTransform transform];
+      [transform translateXBy:0 yBy:baseline_offset_];
+      [transform concat];
+    }
     DrawLabel(label_, attributes_, textRect);
   }
 }
 
 void BubbleDecoration::DrawWithBackgroundInFrame(NSRect background_frame,
                                                  NSRect frame,
                                                  NSView* control_view) {
   NSRect rect = NSInsetRect(background_frame, 0, 1);
   rect.size.width -= kRightSideMargin;
   if (!ui::MaterialDesignController::IsModeMaterial()) {
@@ skipping 28 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;
 }