Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(519)

Unified Diff: ash/sticky_keys/sticky_keys_overlay.cc

Issue 2910153002: Remove views::Label::SetDisabledColor(). Replace with typography colors. (Closed)
Patch Set: rebase for r476345 Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/sticky_keys/sticky_keys_overlay.cc
diff --git a/ash/sticky_keys/sticky_keys_overlay.cc b/ash/sticky_keys/sticky_keys_overlay.cc
index 4fc8c3a0c717fc00abc0a60cf82337f25aa9f2db..36931e8ea53dfdbb30c7158b275f48b10499fe52 100644
--- a/ash/sticky_keys/sticky_keys_overlay.cc
+++ b/ash/sticky_keys/sticky_keys_overlay.cc
@@ -38,7 +38,6 @@ const ui::ResourceBundle::FontStyle kKeyLabelFontStyle =
// Duration of slide animation when overlay is shown or hidden.
const int kSlideAnimationDurationMs = 100;
-}
///////////////////////////////////////////////////////////////////////////////
// StickyKeyOverlayLabel
@@ -67,7 +66,6 @@ StickyKeyOverlayLabel::StickyKeyOverlayLabel(const std::string& key_name)
SetFontList(rb->GetFontList(kKeyLabelFontStyle));
SetAutoColorReadabilityEnabled(false);
SetEnabledColor(SkColorSetARGB(0x80, 0xFF, 0xFF, 0xFF));
- SetDisabledColor(SkColorSetARGB(0x80, 0xFF, 0xFF, 0xFF));
SetSubpixelRenderingEnabled(false);
}
@@ -92,10 +90,11 @@ void StickyKeyOverlayLabel::SetKeyState(StickyKeyState state) {
}
SetEnabledColor(label_color);
- SetDisabledColor(label_color);
SetFontList(font_list().DeriveWithStyle(style));
}
+} // namespace
+
///////////////////////////////////////////////////////////////////////////////
// StickyKeysOverlayView
class StickyKeysOverlayView : public views::View {

Powered by Google App Engine
This is Rietveld 408576698