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

Unified Diff: chrome/browser/ui/views/profiles/profile_chooser_view.cc

Issue 2910153002: Remove views::Label::SetDisabledColor(). Replace with typography colors. (Closed)
Patch Set: Use STYLE_HINT more. Fix SadTab 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: chrome/browser/ui/views/profiles/profile_chooser_view.cc
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view.cc b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
index e7535c427a7e64acecb5a002f9a28dca7c355654..1d9da7c649b1cc971040f63adb7b328fac2f4f16 100644
--- a/chrome/browser/ui/views/profiles/profile_chooser_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
@@ -261,8 +261,7 @@ class BackgroundColorHoverButton : public views::LabelButton {
title_->SetEnabledColor(text_color);
if (subtitle_) {
- DCHECK(!subtitle_->enabled());
- subtitle_->SetDisabledColor(GetNativeTheme()->GetSystemColor(
+ subtitle_->SetEnabledColor(GetNativeTheme()->GetSystemColor(
is_selected
? ui::NativeTheme::kColorId_DisabledMenuItemForegroundColor
: ui::NativeTheme::kColorId_LabelDisabledColor));
Peter Kasting 2017/06/01 04:55:58 Is there a TODO here to use the typography provide
tapted 2017/06/01 11:22:18 Heh, yeah I'd considered this. But if the samples
@@ -1171,7 +1170,6 @@ views::View* ProfileChooserView::CreateCurrentProfileView(
current_profile_card->set_subtitle(email_label);
email_label->SetAutoColorReadabilityEnabled(false);
email_label->SetElideBehavior(gfx::ELIDE_EMAIL);
- email_label->SetEnabled(false);
email_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
grid_layout->StartRow(1, 0);
// Skip first column for the profile icon.

Powered by Google App Engine
This is Rietveld 408576698