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

ui/views/controls/link.cc

 // Copyright (c) 2012 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/controls/link.h"
 
 #include "build/build_config.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 152 matching lines @@
           PlatformStyle::kReturnClicksFocusedControl);
 }
 
 void Link::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   Label::GetAccessibleNodeData(node_data);
   node_data->role = ui::AX_ROLE_LINK;
 }
 
 void Link::OnEnabledChanged() {
   RecalculateFont();
-  View::OnEnabledChanged();
+  View::OnEnabledChanged();  // Jump over Label.
 }
 
 void Link::OnFocus() {
   Label::OnFocus();
   RecalculateFont();
   // We render differently focused.
   SchedulePaint();
 }
 
 void Link::OnBlur() {
   Label::OnBlur();
   RecalculateFont();
   // We render differently focused.
   SchedulePaint();
 }
 
 void Link::SetFontList(const gfx::FontList& font_list) {
   Label::SetFontList(font_list);
   RecalculateFont();
 }
 
 void Link::SetText(const base::string16& text) {
   Label::SetText(text);
   ConfigureFocus();
 }
 
 void Link::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   Label::OnNativeThemeChanged(theme);
-  Label::SetEnabledColor(GetEnabledColor());
-  SetDisabledColor(
-      theme->GetSystemColor(ui::NativeTheme::kColorId_LinkDisabled));
+  Label::SetEnabledColor(GetColor());
 }
 
 void Link::SetEnabledColor(SkColor color) {
   requested_enabled_color_set_ = true;
   requested_enabled_color_ = color;
-  Label::SetEnabledColor(GetEnabledColor());
+  Label::SetEnabledColor(GetColor());
 }
 
 bool Link::IsSelectionSupported() const {
   return false;
 }
 
 void Link::SetUnderline(bool underline) {
   if (underline_ == underline)
     return;
   underline_ = underline;
   RecalculateFont();
 }
 
 void Link::Init() {
   listener_ = NULL;
   pressed_ = false;
   underline_ = GetDefaultFocusStyle() != FocusStyle::UNDERLINE;
   RecalculateFont();
 
   // Label::Init() calls SetText(), but if that's being called from Label(), our
   // SetText() override will not be reached (because the constructed class is
   // only a Label at the moment, not yet a Link).  So explicitly configure focus
   // here.
   ConfigureFocus();
 }
 
 void Link::SetPressed(bool pressed) {
   if (pressed_ != pressed) {
     pressed_ = pressed;
-    Label::SetEnabledColor(GetEnabledColor());
+    Label::SetEnabledColor(GetColor());
     RecalculateFont();
     SchedulePaint();
   }
 }
 
 void Link::RecalculateFont() {
   // Underline the link if it is enabled and |underline_| is true. Also
   // underline to indicate focus when that's the style.
   const int style = font_list().GetFontStyle();
   const bool underline =
@@ skipping 11 matching lines @@
     SetFocusBehavior(FocusBehavior::NEVER);
   } else {
 #if defined(OS_MACOSX)
     SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
 #else
     SetFocusBehavior(FocusBehavior::ALWAYS);
 #endif
   }
 }
 
-SkColor Link::GetEnabledColor() {
+SkColor Link::GetColor() {
+  const ui::NativeTheme* theme = GetNativeTheme();
+  DCHECK(theme);

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

The old code conditionalized this.  Is it guaranteed true even in tests?

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

Yup.

View::GetNativeTheme() and Widget::GetNativeTheme() always return non-null,
falling back to ui::NativeTheme::GetInstanceForNativeUi() (e.g., if there is no
GetWidget()).

(and GetInstanceForNativeUi() returns static locals.. except on Android where it
is NOTREACHED()/nullptr;)

+  if (!enabled())
+    return theme->GetSystemColor(ui::NativeTheme::kColorId_LinkDisabled);
+
   if (requested_enabled_color_set_)
     return requested_enabled_color_;
 
-  if (GetNativeTheme()) {
-    return GetNativeTheme()->GetSystemColor(
-        pressed_ ? ui::NativeTheme::kColorId_LinkPressed
-                 : ui::NativeTheme::kColorId_LinkEnabled);
-  }
-
-  return gfx::kPlaceholderColor;
+  return GetNativeTheme()->GetSystemColor(
+      pressed_ ? ui::NativeTheme::kColorId_LinkPressed
+               : ui::NativeTheme::kColorId_LinkEnabled);
 }
 
 }  // namespace views