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

ash/sticky_keys/sticky_keys_overlay.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 "ash/sticky_keys/sticky_keys_overlay.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/sticky_keys/sticky_keys_controller.h"
 #include "ash/strings/grit/ash_strings.h"
@@ skipping 20 matching lines @@
 
 // Vertical offset of the overlay from the top left of the screen.
 const int kVerticalOverlayOffset = 18;
 
 // Font style used for modifier key labels.
 const ui::ResourceBundle::FontStyle kKeyLabelFontStyle =
     ui::ResourceBundle::LargeFont;
 
 // Duration of slide animation when overlay is shown or hidden.
 const int kSlideAnimationDurationMs = 100;
-}
 
 ///////////////////////////////////////////////////////////////////////////////
 //  StickyKeyOverlayLabel
 class StickyKeyOverlayLabel : public views::Label {
  public:
   explicit StickyKeyOverlayLabel(const std::string& key_name);
 
   ~StickyKeyOverlayLabel() override;
 
   StickyKeyState state() const { return state_; }
 
   void SetKeyState(StickyKeyState state);
 
  private:
   StickyKeyState state_;
 
   DISALLOW_COPY_AND_ASSIGN(StickyKeyOverlayLabel);
 };
 
 StickyKeyOverlayLabel::StickyKeyOverlayLabel(const std::string& key_name)
     : state_(STICKY_KEY_STATE_DISABLED) {
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
 
   SetText(base::UTF8ToUTF16(key_name));
   SetHorizontalAlignment(gfx::ALIGN_LEFT);
   SetFontList(rb->GetFontList(kKeyLabelFontStyle));
   SetAutoColorReadabilityEnabled(false);
   SetEnabledColor(SkColorSetARGB(0x80, 0xFF, 0xFF, 0xFF));
-  SetDisabledColor(SkColorSetARGB(0x80, 0xFF, 0xFF, 0xFF));
   SetSubpixelRenderingEnabled(false);
 }
 
 StickyKeyOverlayLabel::~StickyKeyOverlayLabel() {}
 
 void StickyKeyOverlayLabel::SetKeyState(StickyKeyState state) {
   state_ = state;
   SkColor label_color;
   int style;
   switch (state) {
     case STICKY_KEY_STATE_ENABLED:
       style = gfx::Font::NORMAL;
       label_color = SkColorSetA(enabled_color(), 0xFF);
       break;
     case STICKY_KEY_STATE_LOCKED:
       style = gfx::Font::UNDERLINE;
       label_color = SkColorSetA(enabled_color(), 0xFF);
       break;
     default:
       style = gfx::Font::NORMAL;
       label_color = SkColorSetA(enabled_color(), 0x80);
   }
 
   SetEnabledColor(label_color);
-  SetDisabledColor(label_color);
   SetFontList(font_list().DeriveWithStyle(style));
 }
 
+}  // namespace
+
 ///////////////////////////////////////////////////////////////////////////////
 //  StickyKeysOverlayView
 class StickyKeysOverlayView : public views::View {
  public:
   // This object is not owned by the views hiearchy or by the widget. The
   // StickyKeysOverlay is the only class that should create and destroy this
   // view.
   StickyKeysOverlayView();
 
   ~StickyKeysOverlayView() override;
@@ skipping 197 matching lines @@
     ui::LayerAnimationSequence* sequence) {
   ui::LayerAnimator* animator = overlay_widget_->GetLayer()->GetAnimator();
   if (animator)
     animator->RemoveObserver(this);
 }
 
 void StickyKeysOverlay::OnLayerAnimationScheduled(
     ui::LayerAnimationSequence* sequence) {}
 
 }  // namespace ash