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

ui/views/controls/label.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/label.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 35 matching lines @@
 
 const char Label::kViewClassName[] = "Label";
 
 Label::Label() : Label(base::string16()) {
 }
 
 Label::Label(const base::string16& text)
     : Label(text, style::CONTEXT_LABEL, style::STYLE_PRIMARY) {}
 
 Label::Label(const base::string16& text, int text_context, int text_style)
-    : context_menu_contents_(this) {
+    : text_context_(text_context), context_menu_contents_(this) {
   Init(text, style::GetFont(text_context, text_style));
   SetLineHeight(style::GetLineHeight(text_context, text_style));
+
+  // If an explicit style is given, ignore color changes due to the NativeTheme.
+  if (text_style != style::STYLE_PRIMARY) {
+    SetEnabledColor(
+        style::GetColor(text_context, text_style, GetNativeTheme()));
+  }
 }
 
 Label::Label(const base::string16& text, const CustomFont& font)
-    : context_menu_contents_(this) {
+    : text_context_(style::CONTEXT_LABEL), context_menu_contents_(this) {
   Init(text, font.font_list);
 }
 
 Label::~Label() {
 }
 
 // static
 const gfx::FontList& Label::GetDefaultFontList() {
   return style::GetFont(style::CONTEXT_LABEL, style::STYLE_PRIMARY);
 }
@@ skipping 23 matching lines @@
 
 void Label::SetEnabledColor(SkColor color) {
   if (enabled_color_set_ && requested_enabled_color_ == color)
     return;
   is_first_paint_text_ = true;
   requested_enabled_color_ = color;
   enabled_color_set_ = true;
   RecalculateColors();
 }
 
-void Label::SetDisabledColor(SkColor color) {
+// TODO(tapted): Move this into a subclass used only by LabelButton.
+void Label::SetDisabledColorForLabelButton(SkColor color) {
   if (disabled_color_set_ && requested_disabled_color_ == color)
     return;
   is_first_paint_text_ = true;
   requested_disabled_color_ = color;
   disabled_color_set_ = true;
   RecalculateColors();
 }
 
 void Label::SetBackgroundColor(SkColor color) {
   if (background_color_set_ && background_color_ == color)
@@ skipping 874 matching lines @@
     lines_[i]->SetColor(color);
     lines_[i]->set_selection_color(actual_selection_text_color_);
     lines_[i]->set_selection_background_focused_color(
         selection_background_color_);
     lines_[i]->set_subpixel_rendering_suppressed(subpixel_rendering_suppressed);
   }
 }
 
 void Label::UpdateColorsFromTheme(const ui::NativeTheme* theme) {
   if (!enabled_color_set_) {
-    requested_enabled_color_ = theme->GetSystemColor(
-        ui::NativeTheme::kColorId_LabelEnabledColor);
+    requested_enabled_color_ =
+        style::GetColor(text_context_, style::STYLE_PRIMARY, theme);
   }
   if (!disabled_color_set_) {
-    requested_disabled_color_ = theme->GetSystemColor(
-        ui::NativeTheme::kColorId_LabelDisabledColor);
+    requested_disabled_color_ =
+        style::GetColor(text_context_, style::STYLE_DISABLED, theme);
   }
   if (!background_color_set_) {
     background_color_ =
         theme->GetSystemColor(ui::NativeTheme::kColorId_DialogBackground);
   }
   if (!selection_text_color_set_) {
     requested_selection_text_color_ = theme->GetSystemColor(
         ui::NativeTheme::kColorId_LabelTextSelectionColor);
   }
   if (!selection_background_color_set_) {
@@ skipping 37 matching lines @@
       .WriteText(GetSelectedText());
 }
 
 void Label::BuildContextMenuContents() {
   context_menu_contents_.AddItemWithStringId(IDS_APP_COPY, IDS_APP_COPY);
   context_menu_contents_.AddItemWithStringId(IDS_APP_SELECT_ALL,
                                              IDS_APP_SELECT_ALL);
 }
 
 }  // namespace views