Upstream for a thing

chrome/browser/ui/views/harmony/harmony_typography_provider.cc

 // Copyright 2017 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 "chrome/browser/ui/views/harmony/harmony_typography_provider.h"
 
 #include "chrome/browser/ui/views/harmony/chrome_typography.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/platform_font.h"
@@ skipping 48 matching lines @@
   const SkColor foreground_color =
       theme.GetSystemColor(ui::NativeTheme::kColorId_LabelEnabledColor);
 
   // If the default foreground color from the native theme isn't black, the rest
   // of the Harmony spec isn't going to work. TODO(tapted): Something more
   // generic would be nice here, but that requires knowing the background color
   // for the text. At the time of writing, very few UI surfaces need native-
   // themed typography with a custom native theme. Typically just incognito
   // browser windows, when the native theme is NativeThemeDarkAura.
   if (foreground_color != SK_ColorBLACK) {
+    if (context == views::style::CONTEXT_TEXTFIELD) {
+      return theme.GetSystemColor(
+          style == views::style::STYLE_DISABLED
+              ? ui::NativeTheme::kColorId_TextfieldReadOnlyColor
+              : ui::NativeTheme::kColorId_TextfieldDefaultColor);
+    }
     switch (style) {
       case views::style::STYLE_DISABLED:
       case STYLE_SECONDARY:
       case STYLE_HINT:
         return theme.GetSystemColor(
             ui::NativeTheme::kColorId_LabelDisabledColor);
       case views::style::STYLE_LINK:
         return theme.GetSystemColor(ui::NativeTheme::kColorId_LinkEnabled);
       case STYLE_RED:
         return foreground_color == SK_ColorWHITE ? gfx::kGoogleRed300
@@ skipping 83 matching lines @@
     case views::style::CONTEXT_DIALOG_TITLE:
       return title_height;
     case CONTEXT_BODY_TEXT_LARGE:
       return body_large_height;
     case CONTEXT_HEADLINE:
       return headline_height;
     default:
       return default_height;
   }
 }