chrome/browser/ui/views/payments/credit_card_editor_view_controller.cc - Issue 2910153002: Remove views::Label::SetDisabledColor(). Replace with typography colors.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/payments/credit_card_editor_view_controller.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

« chrome/browser/ui/views/harmony/harmony_typography_provider.cc ('K') | « chrome/browser/ui/views/harmony/harmony_typography_provider.cc ('k') | chrome/browser/ui/views/payments/editor_view_controller.cc » ('j') | chrome/browser/ui/views/payments/payment_sheet_view_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/payments/credit_card_editor_view_controller.cc

diff --git a/chrome/browser/ui/views/payments/credit_card_editor_view_controller.cc b/chrome/browser/ui/views/payments/credit_card_editor_view_controller.cc

index 0068ad31e81f79f8d18e854686b9fbab46418ec7..e9abba59da4e69a7bf4a48c5ae2b5188b62650c8 100644

--- a/chrome/browser/ui/views/payments/credit_card_editor_view_controller.cc

+++ b/chrome/browser/ui/views/payments/credit_card_editor_view_controller.cc

@@ -205,12 +205,9 @@ CreditCardEditorViewController::CreateHeaderView() {

view->SetLayoutManager(layout);

// "Cards accepted" label is "disabled" grey.

Peter Kasting 2017/06/01 04:55:58 Nit: disabled -> hint? This also applies in other

tapted 2017/06/01 11:22:18 Done.

- std::unique_ptr<views::Label> label = base::MakeUnique<views::Label>(

- l10n_util::GetStringUTF16(IDS_PAYMENTS_ACCEPTED_CARDS_LABEL));

- label->SetDisabledColor(label->GetNativeTheme()->GetSystemColor(

- ui::NativeTheme::kColorId_LabelDisabledColor));

- label->SetEnabled(false);

- view->AddChildView(label.release());

+ view->AddChildView(CreateHintLabel(l10n_util::GetStringUTF16(

+ IDS_PAYMENTS_ACCEPTED_CARDS_LABEL))

+ .release());

// 8dp padding is required between icons.

constexpr int kPaddingBetweenCardIcons = 8;