macviews: apply graphite tint to button colors when needed

ui/native_theme/native_theme_mac.mm

Index: ui/native_theme/native_theme_mac.mm
diff --git a/ui/native_theme/native_theme_mac.mm b/ui/native_theme/native_theme_mac.mm
index 1f757dd1cbe0863f4168fb7714bf091e3978e24f..2a4c6c217b91a02bd52ab625fca8832cc665608f 100644
--- a/ui/native_theme/native_theme_mac.mm
+++ b/ui/native_theme/native_theme_mac.mm
@@ -133,20 +133,20 @@ SkColor NativeThemeMac::GetSystemColor(ColorId color_id) const {
       return NSSystemColorToSkColor([NSColor windowBackgroundColor]);
     case kColorId_DialogBackground:
       return ui::MaterialDesignController::IsSecondaryUiMaterial()
-                ? GetAuraColor(color_id, this)
+                ? GetAuraColorWithSystemTint(color_id, this)
                 : kDialogBackgroundColor;
     case kColorId_BubbleBackground:
       return SK_ColorWHITE;
 
     case kColorId_FocusedBorderColor:
       return ui::MaterialDesignController::IsSecondaryUiMaterial()
-                ? GetAuraColor(color_id, this)
+                ? GetAuraColorWithSystemTint(color_id, this)
                 : NSSystemColorToSkColor([NSColor keyboardFocusIndicatorColor]);
     case kColorId_FocusedMenuButtonBorderColor:
       return NSSystemColorToSkColor([NSColor keyboardFocusIndicatorColor]);
     case kColorId_UnfocusedBorderColor:
       return ui::MaterialDesignController::IsSecondaryUiMaterial()
-                ? GetAuraColor(color_id, this)
+                ? GetAuraColorWithSystemTint(color_id, this)
                 : NSSystemColorToSkColor([NSColor controlColor]);
 
     // Buttons and labels.
@@ -161,7 +161,7 @@ SkColor NativeThemeMac::GetSystemColor(ColorId color_id) const {
       return NSSystemColorToSkColor([NSColor controlTextColor]);
     case kColorId_CallToActionColor:
       return ui::MaterialDesignController::IsSecondaryUiMaterial()
-                ? GetAuraColor(color_id, this)
+                ? GetAuraColorWithSystemTint(color_id, this)
                 : NSSystemColorToSkColor([NSColor controlTextColor]);
     case kColorId_ButtonDisabledColor:
     case kColorId_LabelDisabledColor:
@@ -427,6 +427,12 @@ void NativeThemeMac::PaintStyledGradientButton(SkCanvas* canvas,
   canvas->drawDRRect(outer_shape, shape, paint);
 }
 
+SkColor NativeThemeMac::GetAuraColorWithSystemTint(
+    NativeTheme::ColorId color_id,
+    const NativeTheme* base_theme) const {
+  return ApplySystemControlTint(GetAuraColor(color_id, base_theme));
+}
+
 NativeThemeMac::NativeThemeMac() {
 }