Remove views::Label::SetDisabledColor(). Replace with typography colors.

ui/views/style/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 "ui/views/style/typography_provider.h"
 
 #include "base/logging.h"
 #include "ui/base/default_style.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/native_theme/native_theme.h"
 #include "ui/views/style/typography.h"
 
 using gfx::Font;
 
 namespace views {
 namespace {
 
 Font::Weight GetValueBolderThan(Font::Weight weight) {
   switch (weight) {
     case Font::Weight::BOLD:
@@ skipping 20 matching lines @@
 
 const gfx::FontList& DefaultTypographyProvider::GetFont(int context,
                                                         int style) const {
   int size_delta;
   Font::Weight font_weight;
   GetDefaultFont(context, style, &size_delta, &font_weight);
   return ResourceBundle::GetSharedInstance().GetFontListWithDelta(
       size_delta, Font::NORMAL, font_weight);
 }
 
-SkColor DefaultTypographyProvider::GetColor(int context, int style) const {
-  return SK_ColorBLACK;
+SkColor DefaultTypographyProvider::GetColor(
+    int context,
+    int style,
+    const ui::NativeTheme& theme) const {
+  switch (style) {
+    case style::STYLE_DISABLED:
+      return theme.GetSystemColor(ui::NativeTheme::kColorId_LabelDisabledColor);
+  }
+
+  return theme.GetSystemColor(ui::NativeTheme::kColorId_LabelEnabledColor);

[Peter Kasting, 2017/06/01 04:55:58]

Nit: Simpler:

  return theme.GetSystemColor(
      (style == style::STYLE_DISABLED)
          ? ui::NativeTheme::kColorId_LabelDisabledColor
          : ui::NativeTheme::kColorId_LabelEnabledColor);

[tapted, 2017/06/01 11:22:18]

Done.

 }
 
 int DefaultTypographyProvider::GetLineHeight(int context, int style) const {
   return 0;
 }
 
 // static
 void DefaultTypographyProvider::GetDefaultFont(int context,
                                                int style,
                                                int* size_delta,
@@ skipping 26 matching lines @@
         *font_weight = GetValueBolderThan(
             ResourceBundle::GetSharedInstance()
                 .GetFontListWithDelta(*size_delta, Font::NORMAL, *font_weight)
                 .GetFontWeight());
       }
       break;
   }
 }
 
 }  // namespace views