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

ui/chromeos/ime/candidate_view.cc

 // Copyright 2014 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 "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/ime/candidate_window.h"
 #include "ui/chromeos/ime/candidate_view.h"
 #include "ui/chromeos/ime/candidate_window_constants.h"
 #include "ui/gfx/color_utils.h"
@@ skipping 35 matching lines @@
 // Creates the shortcut label, and returns it (never returns NULL).
 // The label text is not set in this function.
 views::Label* CreateShortcutLabel(
     ui::CandidateWindow::Orientation orientation,
     const ui::NativeTheme& theme) {
   // Create the shortcut label. The label will be owned by
   // |wrapped_shortcut_label|, hence it's deleted when
   // |wrapped_shortcut_label| is deleted.
   views::Label* shortcut_label = new views::Label;
 
+  // TODO(tapted): Get this FontList from views::style.
   if (orientation == ui::CandidateWindow::VERTICAL) {
     shortcut_label->SetFontList(shortcut_label->font_list().Derive(
         kFontSizeDelta, gfx::Font::NORMAL, gfx::Font::Weight::BOLD));
   } else {
     shortcut_label->SetFontList(
         shortcut_label->font_list().DeriveWithSizeDelta(kFontSizeDelta));
   }
   // TODO(satorux): Maybe we need to use language specific fonts for
   // candidate_label, like Chinese font for Chinese input method?
-  shortcut_label->SetEnabledColor(theme.GetSystemColor(
-      ui::NativeTheme::kColorId_LabelEnabledColor));
-  shortcut_label->SetDisabledColor(theme.GetSystemColor(
-      ui::NativeTheme::kColorId_LabelDisabledColor));
 
   // Setup paddings.
   const gfx::Insets kVerticalShortcutLabelInsets(1, 6, 1, 6);
   const gfx::Insets kHorizontalShortcutLabelInsets(1, 3, 1, 0);
   const gfx::Insets insets =
       (orientation == ui::CandidateWindow::VERTICAL ?
        kVerticalShortcutLabelInsets :
        kHorizontalShortcutLabelInsets);
   shortcut_label->SetBorder(views::CreateEmptyBorder(
       insets.top(), insets.left(), insets.bottom(), insets.right()));
@@ skipping 140 matching lines @@
         view->SetHighlighted(false);
     }
   } else {
     set_background(NULL);
     SetBorder(views::CreateEmptyBorder(1, 1, 1, 1));
   }
   SchedulePaint();
 }
 
 void CandidateView::StateChanged(ButtonState old_state) {
-  shortcut_label_->SetEnabled(state() != STATE_DISABLED);
+  int text_style = state() == STATE_DISABLED ? views::style::STYLE_DISABLED
+                                             : views::style::STYLE_PRIMARY;
+  shortcut_label_->SetEnabledColor(views::style::GetColor(
+      views::style::CONTEXT_LABEL, text_style, GetNativeTheme()));
   if (state() == STATE_PRESSED)
     SetHighlighted(true);
 }
 
 const char* CandidateView::GetClassName() const {
   return "CandidateView";
 }
 
 bool CandidateView::OnMouseDragged(const ui::MouseEvent& event) {
   if (!HitTestPoint(event.location())) {
@@ skipping 62 matching lines @@
   }
 
   // Reserves the margin for infolist_icon even if it's not visible.
   size.Enlarge(
       kInfolistIndicatorIconWidth + kInfolistIndicatorIconPadding * 2, 0);
   return size;
 }
 
 }  // namespace ime
 }  // namespace ui