Adjust locationbar text vertical position under Material Design.

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 144 matching lines @@
 
   *remaining_frame = frame;
   return left_count;
 }
 
 }  // namespace
 
 @implementation AutocompleteTextFieldCell
 
 @synthesize isPopupMode = isPopupMode_;
+@synthesize singlePixelLineWidth = singlePixelLineWidth_;
 
 - (CGFloat)topTextFrameOffset {
   return 3.0;
 }
 
 - (CGFloat)bottomTextFrameOffset {
   return 3.0;
 }
 
 - (CGFloat)cornerRadius {
@@ skipping 61 matching lines @@
 
 // Overriden to account for the decorations.
 - (NSRect)textFrameForFrame:(NSRect)cellFrame {
   // Get the frame adjusted for decorations.
   std::vector<LocationBarDecoration*> decorations;
   std::vector<NSRect> decorationFrames;
   NSRect textFrame = [super textFrameForFrame:cellFrame];
   CalculatePositionsInFrame(textFrame, leftDecorations_, rightDecorations_,
                             &decorations, &decorationFrames, &textFrame);
 
+  // The text needs to be slightly higher than its default position to match the
+  // Material Design spec. It turns out this adjustment is equal to the single
+  // pixel line width (so 1 on non-Retina, 0.5 on Retina). Make this adjustment
+  // after computing decoration positions because the decorations are already
+  // correctly positioned.
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    textFrame.origin.y -= singlePixelLineWidth_;
+  }
+
   // NOTE: This function must closely match the logic in
   // |-drawInteriorWithFrame:inView:|.
 
   return textFrame;
 }
 
 - (NSRect)textCursorFrameForFrame:(NSRect)cellFrame {
   std::vector<LocationBarDecoration*> decorations;
   std::vector<NSRect> decorationFrames;
   NSRect textFrame;
@@ skipping 27 matching lines @@
     } else {
       maxX = NSMaxX(decorationFrames[index]) + kDecorationHorizontalPad;
     }
   }
 
   // I-beam cursor covers left-most to right-most.
   return NSMakeRect(minX, NSMinY(textFrame), maxX - minX, NSHeight(textFrame));
 }
 
 - (void)drawWithFrame:(NSRect)frame inView:(NSView*)controlView {
-  // Background color.
-  const CGFloat lineWidth = [controlView cr_lineWidth];
   BOOL isModeMaterial = ui::MaterialDesignController::IsModeMaterial();
   BOOL inDarkMode = [[controlView window] inIncognitoModeWithSystemTheme];
   BOOL showingFirstResponder = [self showsFirstResponder];
   // Adjust the inset by 1/2 the line width to get a crisp line (screen pixels
   // lay between cooridnate space lines).
-  CGFloat insetSize = 1 - lineWidth / 2.;
+  CGFloat insetSize = 1 - singlePixelLineWidth_ / 2.;
   if (isModeMaterial && showingFirstResponder && !inDarkMode) {
     insetSize++;
   } else if (!isModeMaterial) {
-    insetSize = lineWidth == 0.5 ? 1.5 : 2.0;
+    insetSize = singlePixelLineWidth_ == 0.5 ? 1.5 : 2.0;
   }
 
   // Compute the border's bezier path.
   NSRect pathRect = NSInsetRect(frame, insetSize, insetSize);
   // In dark mode, make room for a shadow beneath the bottom edge.
   if (inDarkMode && isModeMaterial) {
-    pathRect.size.height -= lineWidth;
+    pathRect.size.height -= singlePixelLineWidth_;
   }
   NSBezierPath* path =
       [NSBezierPath bezierPathWithRoundedRect:pathRect
                                       xRadius:kCornerRadius
                                       yRadius:kCornerRadius];
   if (isModeMaterial) {
-    [path setLineWidth:showingFirstResponder ? lineWidth * 2 : lineWidth];
+    [path setLineWidth:showingFirstResponder ? singlePixelLineWidth_ * 2
+                                             : singlePixelLineWidth_];
   }
 
   // Fill the background.
   [[self backgroundColor] set];
   if (isPopupMode_) {
     NSRectFillUsingOperation(NSInsetRect(frame, 1, 1), NSCompositeSourceOver);
   } else {
     [path fill];
   }
 
@@ skipping 24 matching lines @@
         [[NSColor colorWithCalibratedWhite:71 / 255. alpha:1] set];
         [NSBezierPath clipRect:NSMakeRect(NSMinX(frame), NSMinY(frame),
                                           NSWidth(frame), 3)];
         [path stroke];
       }
 
       // Draw a highlight beneath the top edge, and a shadow beneath the bottom
       // edge.
       {
         gfx::ScopedNSGraphicsContextSaveGState saveState;
-        [NSBezierPath setDefaultLineWidth:lineWidth];
+        [NSBezierPath setDefaultLineWidth:singlePixelLineWidth_];
 
         [[NSColor colorWithCalibratedWhite:120 / 255. alpha:1] set];
         NSPoint origin = NSMakePoint(NSMinX(pathRect) + 3,
-                                     NSMinY(pathRect) + lineWidth);
-        NSPoint destination = NSMakePoint(NSMaxX(pathRect) - 3,
-                                          NSMinY(pathRect) + lineWidth);
+                                     NSMinY(pathRect) + singlePixelLineWidth_);
+        NSPoint destination =
+            NSMakePoint(NSMaxX(pathRect) - 3,
+                        NSMinY(pathRect) + singlePixelLineWidth_);
         [NSBezierPath strokeLineFromPoint:origin
                                   toPoint:destination];
 
-        origin.y = destination.y = NSMaxY(pathRect) + lineWidth;
+        origin.y = destination.y = NSMaxY(pathRect) + singlePixelLineWidth_;
         [[NSColor colorWithCalibratedWhite:69 / 255. alpha:1] set];
         [NSBezierPath strokeLineFromPoint:origin
                                   toPoint:destination];
       }
     }
   } else {
     ui::DrawNinePartImage(frame,
                           isPopupMode_ ? kPopupBorderImageIds
                                        : kNormalBorderImageIds,
                           NSCompositeSourceOver,
                           1.0,
                           true);
   }
 
   // Draw the interior contents. We do this after drawing the border as some
   // of the interior controls draw over it.
   [self drawInteriorWithFrame:frame inView:controlView];
 
   // Draw the focus ring.
   if (showingFirstResponder) {
     if (!isModeMaterial) {
-      NSRect focusRingRect = NSInsetRect(frame, lineWidth, lineWidth);
+      NSRect focusRingRect =
+          NSInsetRect(frame, singlePixelLineWidth_, singlePixelLineWidth_);
       path = [NSBezierPath bezierPathWithRoundedRect:focusRingRect
                                              xRadius:kCornerRadius
                                              yRadius:kCornerRadius];
-      [path setLineWidth:lineWidth * 2.0];
+      [path setLineWidth:singlePixelLineWidth_ * 2.0];
     }
 
-    CGFloat alphaComponent = 0.5 / lineWidth;
+    CGFloat alphaComponent = 0.5 / singlePixelLineWidth_;
     if (isModeMaterial && inDarkMode) {
       alphaComponent = 1;
     }
     [[[NSColor keyboardFocusIndicatorColor]
         colorWithAlphaComponent:alphaComponent] set];
     [path stroke];
   }
 }
 
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
@@ skipping 340 matching lines @@
 
 - (void)handleFocusEvent:(NSEvent*)event
                   ofView:(AutocompleteTextField*)controlView {
   if ([controlView observer]) {
     const bool controlDown = ([event modifierFlags] & NSControlKeyMask) != 0;
     [controlView observer]->OnSetFocus(controlDown);
   }
 }
 
 @end