[Material][Mac] Update Omnibox bubble decorations

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"
 
 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() ? 7 : 3;
+  return ui::MaterialDesignController::IsModeMaterial() ? 8.0 : 3.0;
 }
 
+// Additional padding between the divider between the omnibox text and the
+// divider. The desired value is 8px. We get 3px by subtracting the existing
+// padding in location_bar_view from 8px.
+CGFloat DividerPadding() {
+  return ui::MaterialDesignController::IsModeMaterial() ? 3.0 : 0.0;
+}
 
 // Padding between the icon and label.
 const CGFloat kIconLabelPadding = 4.0;
 
 // Inset for the background.
 const CGFloat kBackgroundYInset = 4.0;
 
 }  // namespace
 
 BubbleDecoration::BubbleDecoration() : baseline_offset_(0) {
@@ skipping 12 matching lines @@
 
   const CGFloat image_width = image ? [image size].width : 0.0;
   if (!label)
     return BubblePadding() + image_width;
 
   // The bubble needs to take up an integral number of pixels.
   // Generally -sizeWithAttributes: seems to overestimate rather than
   // underestimate, so floor() seems to work better.
   const CGFloat label_width =
       std::floor([label sizeWithAttributes:attributes_].width);
-  return BubblePadding() + image_width + kIconLabelPadding + label_width;
+  return BubblePadding() + image_width + kIconLabelPadding + label_width +
+         DividerPadding();
 }
 
 NSRect BubbleDecoration::GetImageRectInFrame(NSRect frame) {
   NSRect imageRect = NSInsetRect(frame, 0.0, kBackgroundYInset);
   if (image_) {
     // Center the image vertically.
     const NSSize imageSize = [image_ size];
     imageRect.origin.y +=
         std::floor((NSHeight(frame) - imageSize.height) / 2.0);
     imageRect.size = imageSize;
@@ skipping 25 matching lines @@
     imageRect.size = imageSize;
     [image_ drawInRect:imageRect
               fromRect:NSZeroRect  // Entire image
              operation:NSCompositeSourceOver
               fraction:1.0
         respectFlipped:YES
                  hints:nil];
     textOffset = NSMaxX(imageRect) + kIconLabelPadding;
   }
 
+  // Draw the divider and set the text color.
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    NSBezierPath* line = [NSBezierPath bezierPath];
+    [line setLineWidth:1];
+    [line moveToPoint:NSMakePoint(NSMaxX(decoration_frame) - DividerPadding(),
+                                  NSMinY(decoration_frame))];
+    [line lineToPoint:NSMakePoint(NSMaxX(decoration_frame) - DividerPadding(),
+                                  NSMaxY(decoration_frame))];
+
+    bool in_dark_mode = [[control_view window] inIncognitoModeWithSystemTheme];
+    [GetDividerColor(in_dark_mode) set];
+    [line stroke];
+
+    NSColor* text_color =
+        in_dark_mode
+            ? skia::SkColorToCalibratedNSColor(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);
     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()) {
-    CGFloat lineWidth = [control_view cr_lineWidth];
-    rect = NSInsetRect(rect, lineWidth / 2., lineWidth / 2.);
-    NSBezierPath* path = [NSBezierPath bezierPathWithRoundedRect:rect
-                                                         xRadius:3
-                                                         yRadius:3];
-    [path setLineWidth:lineWidth];
-    bool inDarkMode = [[control_view window] inIncognitoModeWithSystemTheme];
-    if (inDarkMode) {
-      [[NSColor whiteColor] set];
-      [path fill];
-    } else {
-      [GetBackgroundBorderColor() set];
-      [path stroke];
-    }
-  } else {
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
     ui::DrawNinePartImage(
         rect, GetBubbleImageIds(), NSCompositeSourceOver, 1.0, true);
   }
 
   DrawInFrame(frame, control_view);
 }
 
 NSFont* BubbleDecoration::GetFont() const {
   return [attributes_ objectForKey:NSFontAttributeName];
 }
@@ skipping 18 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;
 }