macviews: use mac-y focus rings

This change:
1) Uses the system focus ring color even when SecondaryUiMd is enabled
2) Moves focus ring thickness and inset out to PlatformStyle
3) Adds Mac overrides of the default values

Bug: 832306
Change-Id: I6c18d9d0431dc411a5cb95f9c0639e41f4aa1127
Reviewed-on: https://chromium-review.googlesource.com/1012163
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551030}

ui/native_theme/native_theme_mac.mm

@@ -160,6 +160,12 @@ SkColor NativeThemeMac::GetSystemColor(ColorId color_id) const {
     case kColorId_LabelTextSelectionBackgroundFocused:
     case kColorId_TextfieldSelectionBackgroundFocused:
       return NSSystemColorToSkColor([NSColor selectedTextBackgroundColor]);
+
+    case kColorId_FocusedBorderColor:
+      return NSSystemColorToSkColor([NSColor keyboardFocusIndicatorColor]);
+    case kColorId_UnfocusedBorderColor:
+      return NSSystemColorToSkColor([NSColor controlColor]);
+
     default:
       break;
   }

ui/views/controls/focus_ring.cc

@@ -5,14 +5,13 @@
 #include "ui/views/controls/focus_ring.h"
 
 #include "ui/gfx/canvas.h"
+#include "ui/views/controls/focusable_border.h"
+#include "ui/views/style/platform_style.h"
 
 namespace views {
 
 namespace {
 
-// The default stroke width of the focus border in dp.
-constexpr float kFocusHaloThicknessDp = 2.f;
-
 FocusRing* GetFocusRing(View* parent) {
   for (int i = 0; i < parent->child_count(); ++i) {
     if (parent->child_at(i)->GetClassName() == FocusRing::kViewClassName)
@@ -76,7 +75,7 @@ void FocusRing::Layout() {
   // The focus ring handles its own sizing, which is simply to fill the parent
   // and extend a little beyond its borders.
   gfx::Rect focus_bounds = parent()->GetLocalBounds();
-  focus_bounds.Inset(gfx::Insets(-kFocusHaloThicknessDp));
+  focus_bounds.Inset(gfx::Insets(PlatformStyle::kFocusHaloInset));
   SetBoundsRect(focus_bounds);
 }
 
@@ -85,14 +84,14 @@ void FocusRing::OnPaint(gfx::Canvas* canvas) {
   flags.setAntiAlias(true);
   flags.setColor(SkColorSetA(color_, 0x66));
   flags.setStyle(cc::PaintFlags::kStroke_Style);
-  flags.setStrokeWidth(kFocusHaloThicknessDp);
+  flags.setStrokeWidth(PlatformStyle::kFocusHaloThickness);
   gfx::RectF rect(GetLocalBounds());
-  rect.Inset(gfx::InsetsF(kFocusHaloThicknessDp / 2.f));
+  rect.Inset(gfx::InsetsF(PlatformStyle::kFocusHaloThickness / 2.f));
   // The focus indicator should hug the normal border, when present (as in the
   // case of text buttons). Since it's drawn outside the parent view, increase
   // the rounding slightly by adding half the ring thickness.
-  canvas->DrawRoundRect(rect, corner_radius_ + kFocusHaloThicknessDp / 2.f,
-                        flags);
+  canvas->DrawRoundRect(
+      rect, corner_radius_ + PlatformStyle::kFocusHaloThickness / 2.f, flags);
 }
 
 void FocusRing::OnViewNativeThemeChanged(View* observed_view) {

ui/views/style/platform_style.cc

@@ -57,6 +57,9 @@ const bool PlatformStyle::kUseRipples = true;
 const bool PlatformStyle::kTextfieldScrollsToStartOnFocusChange = false;
 const bool PlatformStyle::kTextfieldUsesDragCursorWhenDraggable = true;
 const bool PlatformStyle::kShouldElideBookmarksInBookmarksBar = false;
+const float PlatformStyle::kFocusHaloThickness = 2.f;
+const float PlatformStyle::kFocusHaloInset =
+    -PlatformStyle::kFocusHaloThickness;
 
 // static
 std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) {

ui/views/style/platform_style.h

@@ -74,6 +74,10 @@ class VIEWS_EXPORT PlatformStyle {
   // tail] or fade out.
   static const bool kShouldElideBookmarksInBookmarksBar;
 
+  // The thickness and inset amount of focus ring halos.
+  static const float kFocusHaloThickness;
+  static const float kFocusHaloInset;
+
   // Creates the default scrollbar for the given orientation.
   static std::unique_ptr<ScrollBar> CreateScrollBar(bool is_horizontal);
 

ui/views/style/platform_style_mac.mm

@@ -42,6 +42,8 @@ const bool PlatformStyle::kTextfieldUsesDragCursorWhenDraggable = false;
 const bool PlatformStyle::kTreeViewSelectionPaintsEntireRow = true;
 const bool PlatformStyle::kShouldElideBookmarksInBookmarksBar = true;
 const bool PlatformStyle::kUseRipples = false;
+const float PlatformStyle::kFocusHaloThickness = 4.f;
+const float PlatformStyle::kFocusHaloInset = -2.f;
 
 const Button::NotifyAction PlatformStyle::kMenuNotifyActivationAction =
     Button::NOTIFY_ON_PRESS;