cocoa: darken toolbar buttons in Increase Contrast mode

chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm

Index: chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm
diff --git a/chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm
index e5065fcaa490ef6da807bcaa4e71580a839893e5..f2b15d1221ac83681d07573acdf4caee0e73b253 100644
--- a/chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm
+++ b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button.mm
@@ -9,6 +9,7 @@
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "ui/base/material_design/material_design_controller.h"
+#include "ui/base/theme_provider.h"
 #include "ui/gfx/color_palette.h"
 
 @interface AppToolbarButton ()
@@ -50,9 +51,13 @@ - (void)commonInit {
 }
 
 - (SkColor)vectorIconColor:(BOOL)themeIsDark {
+  const ui::ThemeProvider* provider = [[self window] themeProvider];
   switch (severity_) {
     case AppMenuIconController::Severity::NONE:
-      return themeIsDark ? SK_ColorWHITE : gfx::kChromeIconGrey;
+      return themeIsDark ? SK_ColorWHITE
+                         : provider && provider->ShouldIncreaseContrast()

[Mark Mentovai, 2017/02/23 01:54:16]

I suggest but don’t require (parentheses) around everything after the first
colon to answer the question “does this do what it means?” without having to
refer to a precedence table. (Yeah, it does do what it means here…)

+                               ? SK_ColorBLACK
+                               : gfx::kChromeIconGrey;
       break;
 
     case AppMenuIconController::Severity::LOW: