Implement Material Design for Mac toolbar.

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

Index: chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm
index 01d8b200da8b38a194c4e50cf453c644caa94bfb..f931c2f415c7da7bac53a5a97d22e3ffe5864cf2 100644
--- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm
+++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm
@@ -10,14 +10,17 @@
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_logging.h"
 #include "chrome/browser/search/search.h"
+#include "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h"
+#import "chrome/browser/ui/cocoa/themed_window.h"
 #import "extensions/common/feature_switch.h"
 #include "grit/theme_resources.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #import "ui/base/cocoa/appkit_utils.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/base/cocoa/scoped_cg_context_smooth_fonts.h"
+#include "ui/base/material_design/material_design_controller.h"
 
 using extensions::FeatureSwitch;
 
@@ -289,39 +292,69 @@ size_t CalculatePositionsInFrame(
 - (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];

[Avi (use Gerrit), 2016/03/01 19:59:06]

hasDarkTheme?

It's not clear when inIncognitoModeWithSystemTheme is appropriate and when
hasDarkTheme is appropriate. On my initial read, it seems like we'd always want
the latter because it's more flexible for weird situations that the user might
put us in.

[shrike, 2016/03/01 20:30:14]

See previous reply.

+  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.;
+  if (isModeMaterial && showingFirstResponder && !inDarkMode) {
+    insetSize++;
+  } else if (!isModeMaterial) {
+    insetSize = lineWidth == 0.5 ? 1.5 : 2.0;
+  }
+
+  // Compute the border's bezier path.
+  NSRect pathRect = NSInsetRect(frame, insetSize, insetSize);
+  NSBezierPath* path =
+      [NSBezierPath bezierPathWithRoundedRect:pathRect
+                                      xRadius:kCornerRadius
+                                      yRadius:kCornerRadius];
+  if (isModeMaterial) {
+    [path setLineWidth:showingFirstResponder ? lineWidth * 2 : lineWidth];
+  }
+
+  // Fill the background.
+  [[self backgroundColor] set];
   if (isPopupMode_) {
-    [[self backgroundColor] set];
     NSRectFillUsingOperation(NSInsetRect(frame, 1, 1), NSCompositeSourceOver);
   } else {
-    CGFloat insetSize = lineWidth == 0.5 ? 1.5 : 2.0;
-    NSRect fillRect = NSInsetRect(frame, insetSize, insetSize);
-    [[self backgroundColor] set];
-    [[NSBezierPath bezierPathWithRoundedRect:fillRect
-                                     xRadius:kCornerRadius
-                                     yRadius:kCornerRadius] fill];
+    [path fill];
   }
 
-  // Border.
-  ui::DrawNinePartImage(frame,
-                        isPopupMode_ ? kPopupBorderImageIds
-                                     : kNormalBorderImageIds,
-                        NSCompositeSourceOver,
-                        1.0,
-                        true);
+  // Draw the border.
+  if (isModeMaterial) {
+    [[NSColor colorWithCalibratedWhite:168 / 255. alpha:1] set];
+    [path stroke];
+  } else {
+    ui::DrawNinePartImage(frame,
+                          isPopupMode_ ? kPopupBorderImageIds
+                                       : kNormalBorderImageIds,
+                          NSCompositeSourceOver,
+                          1.0,
+                          true);
+  }
 
-  // Interior contents. Drawn after the border as some of the interior controls
-  // draw over the border.
+  // 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];
 
-  // Focus ring.
-  if ([self showsFirstResponder]) {
-    NSRect focusRingRect = NSInsetRect(frame, lineWidth, lineWidth);
+  // Draw the focus ring.
+  if (showingFirstResponder) {
+    if (!isModeMaterial) {
+      NSRect focusRingRect = NSInsetRect(frame, lineWidth, lineWidth);
+      path = [NSBezierPath bezierPathWithRoundedRect:focusRingRect
+                                             xRadius:kCornerRadius
+                                             yRadius:kCornerRadius];
+      [path setLineWidth:lineWidth * 2.0];
+    }
+
+    CGFloat alphaComponent = 0.5 / lineWidth;
+    if (isModeMaterial && inDarkMode) {
+      alphaComponent = 1;
+    }
     [[[NSColor keyboardFocusIndicatorColor]
-        colorWithAlphaComponent:0.5 / lineWidth] set];
-    NSBezierPath* path = [NSBezierPath bezierPathWithRoundedRect:focusRingRect
-                                                         xRadius:kCornerRadius
-                                                         yRadius:kCornerRadius];
-    [path setLineWidth:lineWidth * 2.0];
+        colorWithAlphaComponent:alphaComponent] set];
     [path stroke];
   }
 }