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

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

 // Copyright 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/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #import "base/mac/mac_util.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 156 matching lines @@
       break;
     default:
       // Make it obvious that there's a problem.
       [[NSColor redColor] set];
       NSRectFill(NSMakeRect(0, 0, kDefaultIconSize, kDefaultIconSize));
       break;
   }
 }
 
 + (void)drawLocationBarIconHTTPForScale:(int)scaleFactor {
-  NSBezierPath* circlePath =
-      [NSBezierPath bezierPathWithOvalInRect:NSMakeRect(2, 2, 12, 12)];
-  [circlePath setLineWidth:1.5];
-  [circlePath stroke];
+  if (scaleFactor > 1) {
+    NSRect ovalRect = NSMakeRect(2.25, 1.75, 12, 12);
+    NSBezierPath* circlePath =
+        [NSBezierPath bezierPathWithOvalInRect:ovalRect];
+    [circlePath setLineWidth:1.5];
+    [circlePath stroke];
 
-  NSRectFill(NSMakeRect(7, 4, 2, 5));
-  NSRectFill(NSMakeRect(7, 10, 2, 2));
+    NSRectFill(NSMakeRect(7.5, 4.5, 1.5, 4));
+    NSRectFill(NSMakeRect(7.5, 9.5, 1.5, 1.5));
+  } else {
+    NSRect ovalRect = NSMakeRect(2, 2, 12, 12);
+    NSBezierPath* circlePath =
+        [NSBezierPath bezierPathWithOvalInRect:ovalRect];
+    [circlePath setLineWidth:1.5];
+    [circlePath stroke];
+
+    NSRectFill(NSMakeRect(7, 4, 2, 5));
+    NSRectFill(NSMakeRect(7, 10, 2, 2));
+  }
 }
 
 + (void)drawLocationBarIconHTTPSInvalidForScale:(int)scaleFactor {
   // The vector icon is upside down relative to the default OS X coordinate
   // system so rotate by 180 degrees.
   CGContextRef context = static_cast<CGContextRef>(
       [[NSGraphicsContext currentContext] graphicsPort]);
   const int kHalfDefaultIconSize = kDefaultIconSize / 2;
   CGContextTranslateCTM(context, kHalfDefaultIconSize, kHalfDefaultIconSize);
   CGContextRotateCTM(context, M_PI);
@@ skipping 22 matching lines @@
   [cutOutPath relativeLineToPoint:NSMakePoint(0, -3)];
   [cutOutPath relativeLineToPoint:NSMakePoint(2, 0)];
   [cutOutPath relativeLineToPoint:NSMakePoint(0, 3)];
   [cutOutPath closePath];
 
   [trianglePath appendBezierPath:cutOutPath];
   [trianglePath fill];
 }
 
 + (void)drawLocationBarIconHTTPSValidForScale:(int)scaleFactor {
+  NSAffineTransform* transform = [NSAffineTransform transform];
+  // Adjust down 1px in Retina, so that the lock sits on the text baseline.
+  if (scaleFactor > 1) {
+    [transform translateXBy:0 yBy:-0.5];
+  }
+
   NSBezierPath* rectPath =
       [NSBezierPath bezierPathWithRoundedRect:NSMakeRect(4, 3, 8, 7)
                                       xRadius:1
                                       yRadius:1];
+  [rectPath transformUsingAffineTransform:transform];
   [rectPath fill];
 
   NSBezierPath* curvePath = [NSBezierPath bezierPath];
   [curvePath moveToPoint:NSMakePoint(5.5, 9.75)];
   [curvePath lineToPoint:NSMakePoint(5.5, 10)];
   [curvePath curveToPoint:NSMakePoint(8, 13)
             controlPoint1:NSMakePoint(5.5, 13)
             controlPoint2:NSMakePoint(7.5, 13)];
   [curvePath curveToPoint:NSMakePoint(10.5, 10)
             controlPoint1:NSMakePoint(8.5, 13)
             controlPoint2:NSMakePoint(10.5, 13)];
   [curvePath lineToPoint:NSMakePoint(10.5, 9.75)];
   [curvePath setLineWidth:1.25];
+  [curvePath transformUsingAffineTransform:transform];
   [curvePath stroke];
 }
 
 @end
 
 // TODO(shess): This code is mostly copied from the gtk
 // implementation.  Make sure it's all appropriate and flesh it out.
 
 LocationBarViewMac::LocationBarViewMac(AutocompleteTextField* field,
                                        CommandUpdater* command_updater,
@@ skipping 716 matching lines @@
 
   return zoom_decoration_->UpdateIfNecessary(
       zoom::ZoomController::FromWebContents(web_contents), default_zoom_changed,
       IsLocationBarDark());
 }
 
 void LocationBarViewMac::OnDefaultZoomLevelChanged() {
   if (UpdateZoomDecoration(/*default_zoom_changed=*/true))
     OnDecorationsChanged();
 }