Co-locate all NativeTheme Aura colors.

Before this patch, colors chosen to look good for Aura were split between
CommonThemeGetSystemColor and NativeThemeAura. This moves all the colors
to the former and changes the signature a bit.

There should be no effective change on any platform with this CL.

BUG=530645
TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/1476663002

Cr-Commit-Position: refs/heads/master@{#362326}

chrome/browser/download/download_shelf.cc

@@ -80,7 +80,7 @@ void DownloadShelf::PaintDownloadProgress(
   SkPaint bg_paint;
   bg_paint.setStyle(SkPaint::kFill_Style);
   SkColor indicator_color =
-      theme_provider.GetColor(ThemeProperties::COLOR_THROBBER_SPINNING);
+      theme_provider.GetColor(ThemeProperties::COLOR_TAB_THROBBER_SPINNING);
   bg_paint.setColor(SkColorSetA(indicator_color, 0x33));
   bg_paint.setAntiAlias(true);
   const SkScalar kCenterPoint = kProgressIndicatorSize / 2.f;

chrome/browser/themes/theme_properties.h

@@ -86,6 +86,13 @@ class ThemeProperties {
     // The color of a disabled toolbar button's icon.
     COLOR_TOOLBAR_BUTTON_ICON_INACTIVE,
 
+    // The throbber colors for tabs or anything on a toolbar (currently, only
+    // the download shelf). If you're adding a throbber elsewhere, such as in
+    // a dialog or bubble, you likely want
+    // NativeTheme::kColorId_ThrobberSpinningColor.
+    COLOR_TAB_THROBBER_SPINNING,
+    COLOR_TAB_THROBBER_WAITING,
+
     // These colors don't have constant default values. They are derived from
     // the runtime value of other colors.
     COLOR_NTP_SECTION_HEADER_TEXT,
@@ -93,8 +100,6 @@ class ThemeProperties {
     COLOR_NTP_SECTION_HEADER_RULE,
     COLOR_NTP_SECTION_HEADER_RULE_LIGHT,
     COLOR_NTP_TEXT_LIGHT,
-    COLOR_THROBBER_SPINNING,
-    COLOR_THROBBER_WAITING,
 #if defined(ENABLE_SUPERVISED_USERS)
     COLOR_SUPERVISED_USER_LABEL,
     COLOR_SUPERVISED_USER_LABEL_BACKGROUND,

chrome/browser/themes/theme_service.cc

@@ -240,15 +240,13 @@ SkColor ThemeService::GetColor(int id) const {
       return IncreaseLightness(GetColor(Properties::COLOR_NTP_TEXT), 0.86);
     case Properties::COLOR_NTP_TEXT_LIGHT:
       return IncreaseLightness(GetColor(Properties::COLOR_NTP_TEXT), 0.40);
-    case Properties::COLOR_THROBBER_SPINNING:
-    case Properties::COLOR_THROBBER_WAITING: {
-      SkColor base_color;
-      bool found_color = ui::CommonThemeGetSystemColor(
-          id == Properties::COLOR_THROBBER_SPINNING
-              ? ui::NativeTheme::kColorId_ThrobberSpinningColor
-              : ui::NativeTheme::kColorId_ThrobberWaitingColor,
-          &base_color);
-      DCHECK(found_color);
+    case Properties::COLOR_TAB_THROBBER_SPINNING:
+    case Properties::COLOR_TAB_THROBBER_WAITING: {
+      SkColor base_color =
+          ui::GetAuraColor(id == Properties::COLOR_TAB_THROBBER_SPINNING
+                               ? ui::NativeTheme::kColorId_ThrobberSpinningColor
+                               : ui::NativeTheme::kColorId_ThrobberWaitingColor,
+                           nullptr);
       color_utils::HSL hsl = GetTint(Properties::TINT_BUTTONS);
       return color_utils::HSLShift(base_color, hsl);
     }

chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm

@@ -5,7 +5,6 @@
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
-#include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
 #include "chrome/browser/ui/chrome_style.h"
@@ -29,7 +28,7 @@
 #import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/theme_provider.h"
+#include "ui/native_theme/native_theme_mac.h"
 
 namespace {
 
@@ -659,11 +658,9 @@ void CardUnmaskPromptViewBridge::PerformClose() {
   [mainView addSubview:progressOverlayView_];
 
   progressOverlayLabel_.reset([constrained_window::CreateLabel() retain]);
-  NSView* webContentView = bridge_->GetWebContents()->GetNativeView();
-  ui::ThemeProvider* themeProvider = [[webContentView window] themeProvider];
-  DCHECK(themeProvider);
-  NSColor* throbberBlueColor = themeProvider->GetNSColor(
-      ThemeProperties::COLOR_THROBBER_SPINNING);
+  NSColor* throbberBlueColor = gfx::SkColorToCalibratedNSColor(
+      ui::NativeThemeMac::instance()->GetSystemColor(
+          ui::NativeTheme::kColorId_ThrobberSpinningColor));
   [progressOverlayLabel_ setTextColor:throbberBlueColor];
   [progressOverlayView_ addSubview:progressOverlayLabel_];
 

chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

@@ -794,12 +794,10 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
     backgroundColor:(NSColor*)backgroundColor {
   if ((self = [super initWithFrame:frameRect])) {
     backgroundColor_.reset([backgroundColor retain]);
-    // Use a color from the common theme, since this button is not trying to
-    // look like a native control.
-    SkColor hoverColor;
-    bool found = ui::CommonThemeGetSystemColor(
-        ui::NativeTheme::kColorId_ButtonHoverBackgroundColor, &hoverColor);
-    DCHECK(found);
+    // Use a color from Aura, since this button is not trying to look like a
+    // native control.
+    SkColor hoverColor = ui::GetAuraColor(
+        ui::NativeTheme::kColorId_ButtonHoverBackgroundColor, nullptr);
     hoverColor_.reset([gfx::SkColorToSRGBNSColor(hoverColor) retain]);
 
     [self setBordered:NO];

chrome/browser/ui/libgtk2ui/gtk2_ui.cc

@@ -1011,9 +1011,9 @@ void Gtk2UI::LoadGtkValues() {
       theme->GetSystemColor(
           ui::NativeTheme::kColorId_TextfieldReadOnlyColor);
 
-  colors_[ThemeProperties::COLOR_THROBBER_SPINNING] =
+  colors_[ThemeProperties::COLOR_TAB_THROBBER_SPINNING] =
       theme->GetSystemColor(ui::NativeTheme::kColorId_ThrobberSpinningColor);
-  colors_[ThemeProperties::COLOR_THROBBER_WAITING] =
+  colors_[ThemeProperties::COLOR_TAB_THROBBER_WAITING] =
       theme->GetSystemColor(ui::NativeTheme::kColorId_ThrobberWaitingColor);
 }
 

chrome/browser/ui/views/tabs/tab.cc

@@ -1324,17 +1324,18 @@ void Tab::PaintIcon(gfx::Canvas* canvas) {
       waiting_state_.elapsed_time =
           base::TimeTicks::Now() - waiting_start_time_;
       gfx::PaintThrobberWaiting(
-          canvas, bounds, tp->GetColor(ThemeProperties::COLOR_THROBBER_WAITING),
+          canvas, bounds,
+          tp->GetColor(ThemeProperties::COLOR_TAB_THROBBER_WAITING),
           waiting_state_.elapsed_time);
     } else {
       if (loading_start_time_ == base::TimeTicks())
         loading_start_time_ = base::TimeTicks::Now();
 
       waiting_state_.color =
-          tp->GetColor(ThemeProperties::COLOR_THROBBER_WAITING);
+          tp->GetColor(ThemeProperties::COLOR_TAB_THROBBER_WAITING);
       gfx::PaintThrobberSpinningAfterWaiting(
           canvas, bounds,
-          tp->GetColor(ThemeProperties::COLOR_THROBBER_SPINNING),
+          tp->GetColor(ThemeProperties::COLOR_TAB_THROBBER_SPINNING),
           base::TimeTicks::Now() - loading_start_time_, &waiting_state_);
     }
   } else {

ui/native_theme/common_theme.h

@@ -18,10 +18,11 @@ namespace ui {
 
 // Drawing code that is common for all platforms.
 
-// Returns true and |color| if |color_id| is found, or false otherwise.
-bool NATIVE_THEME_EXPORT CommonThemeGetSystemColor(
-    NativeTheme::ColorId color_id,
-    SkColor* color);
+// Returns the color to use on Aura for |color_id|.  For a few colors that are
+// theme-specific, |base_theme| must be non-null; consult the code to see which
+// color IDs fall into this category.
+SkColor NATIVE_THEME_EXPORT GetAuraColor(NativeTheme::ColorId color_id,
+                                         const NativeTheme* base_theme);
 
 gfx::Size NATIVE_THEME_EXPORT CommonThemeGetPartSize(
     NativeTheme::Part part,

ui/native_theme/native_theme_dark_aura.cc

@@ -32,9 +32,6 @@ SkColor NativeThemeDarkAura::GetSystemColor(ColorId color_id) const {
   static const SkColor kResultsTableDimmedText =
       SkColorSetA(kResultsTableText, 0x80);
 
-  static const SkColor kThrobberSpinning = SK_ColorWHITE;
-  static const SkColor kThrobberWaiting = SkColorSetA(kThrobberSpinning, 0x80);
-
   switch (color_id) {
     // Button
     case kColorId_CallToActionColor:
@@ -69,13 +66,6 @@ SkColor NativeThemeDarkAura::GetSystemColor(ColorId color_id) const {
     case kColorId_ResultsTableSelectedDimmedText:
       return kResultsTableDimmedText;
 
-    // Colors for the material spinner (aka throbber).
-    case kColorId_ThrobberSpinningColor:
-    case kColorId_ThrobberLightColor:
-      return kThrobberSpinning;
-    case kColorId_ThrobberWaitingColor:
-      return kThrobberWaiting;
-
     // Intentional pass-throughs to NativeThemeAura.
     case kColorId_ResultsTableHoveredBackground:
     case kColorId_ResultsTableSelectedBackground:

ui/native_theme/native_theme_mac.mm

@@ -234,15 +234,9 @@ SkColor NativeThemeMac::GetSystemColor(ColorId color_id) const {
       return SkColorSetRGB(140, 140, 140);
 
     default:
-      break;  // TODO(tapted): Handle all values and remove the default case.
+      // TODO(tapted): Handle all values and remove the default case.
+      return GetAuraColor(color_id, this);
   }
-
-  SkColor color;
-  if (CommonThemeGetSystemColor(color_id, &color))
-    return color;
-
-  NOTIMPLEMENTED() << " Invalid color_id: " << color_id;
-  return SK_ColorRED;
 }
 
 void NativeThemeMac::PaintScrollbarTrack(

ui/native_theme/native_theme_win.cc

@@ -24,6 +24,7 @@
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/resource/material_design/material_design_controller.h"
+#include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/gdi_util.h"
 #include "ui/gfx/geometry/rect.h"
@@ -452,7 +453,6 @@ void NativeThemeWin::PaintDirect(SkCanvas* canvas,
 
 SkColor NativeThemeWin::GetSystemColor(ColorId color_id) const {
   // TODO: Obtain the correct colors using GetSysColor.
-  const SkColor kInvalidColorIdColor = SkColorSetRGB(255, 0, 128);
   const SkColor kUrlTextColor = SkColorSetRGB(0x0b, 0x80, 0x43);
   // Dialogs:
   const SkColor kDialogBackgroundColor = SkColorSetRGB(251, 251, 251);
@@ -463,7 +463,10 @@ SkColor NativeThemeWin::GetSystemColor(ColorId color_id) const {
   const SkColor kButtonBackgroundColor = SkColorSetRGB(0xde, 0xde, 0xde);
   const SkColor kButtonHighlightColor = SkColorSetARGB(200, 255, 255, 255);
   const SkColor kButtonHoverColor = SkColorSetRGB(6, 45, 117);
+  const SkColor kCallToActionColorInvert = gfx::kGoogleBlue300;
   // MenuItem:
+  const SkColor kMenuSchemeHighlightBackgroundColorInvert =
+      SkColorSetRGB(0x30, 0x30, 0x30);
   // Link:
   const SkColor kLinkPressedColor = SkColorSetRGB(200, 0, 0);
   // Table:
@@ -538,7 +541,7 @@ SkColor NativeThemeWin::GetSystemColor(ColorId color_id) const {
     case kColorId_TooltipBackground:
     case kColorId_TooltipText:
       NOTREACHED();
-      return kInvalidColorIdColor;
+      return gfx::kPlaceholderColor;
 
     // Tree
     // NOTE: these aren't right for all themes, but as close as I could get.
@@ -635,12 +638,18 @@ SkColor NativeThemeWin::GetSystemColor(ColorId color_id) const {
       break;
   }
 
-  SkColor color;
-  if (CommonThemeGetSystemColor(color_id, &color))
-    return color;
+  if (color_utils::IsInvertedColorScheme()) {
+    switch (color_id) {
+      case NativeTheme::kColorId_FocusedMenuItemBackgroundColor:
+        return kMenuSchemeHighlightBackgroundColorInvert;
+      case NativeTheme::kColorId_CallToActionColor:
+        return kCallToActionColorInvert;
+      default:
+        return color_utils::InvertColor(GetAuraColor(color_id, this));
+    }
+  }
 
-  NOTREACHED();
-  return kInvalidColorIdColor;
+  return GetAuraColor(color_id, this);
 }
 
 void NativeThemeWin::PaintIndirect(SkCanvas* canvas,