| Index: chrome/browser/ui/views/autofill/password_generation_popup_view_views.cc
|
| diff --git a/chrome/browser/ui/views/autofill/password_generation_popup_view_views.cc b/chrome/browser/ui/views/autofill/password_generation_popup_view_views.cc
|
| index 33272c1da37ccadb90a18ff2e324e36c03da5397..40ba03042540482c9c36767df865521818572298 100644
|
| --- a/chrome/browser/ui/views/autofill/password_generation_popup_view_views.cc
|
| +++ b/chrome/browser/ui/views/autofill/password_generation_popup_view_views.cc
|
| @@ -18,11 +18,6 @@ namespace autofill {
|
|
|
| namespace {
|
|
|
| -const SkColor kExplanatoryTextBackground = SkColorSetRGB(0xF5, 0xF5, 0xF5);
|
| -const SkColor kExplanatoryTextColor = SkColorSetRGB(0x66, 0x66, 0x66);
|
| -const SkColor kDividerColor = SkColorSetRGB(0xE9, 0xE9, 0xE9);
|
| -const SkColor kLinkColor = SkColorSetRGB(0x55, 0x59, 0xFE);
|
| -
|
| // The amount of whitespace that is present when there is no padding. Used
|
| // to get the proper spacing in the help section.
|
| const int kHelpVerticalOffset = 3;
|
| @@ -48,7 +43,8 @@ class PasswordRow : public views::View {
|
|
|
| suggestion_label_ = new views::Label(suggestion, font_list);
|
| suggestion_label_->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
|
| - suggestion_label_->SetEnabledColor(kExplanatoryTextColor);
|
| + suggestion_label_->SetEnabledColor(
|
| + PasswordGenerationPopupView::GetExplanatoryTextColor());
|
| AddChildView(suggestion_label_);
|
| }
|
| virtual ~PasswordRow() {}
|
| @@ -80,17 +76,18 @@ PasswordGenerationPopupViewViews::PasswordGenerationPopupViewViews(
|
| help_label_ = new views::StyledLabel(controller_->HelpText(), this);
|
| help_label_->SetBaseFontList(controller_->font_list());
|
| views::StyledLabel::RangeStyleInfo default_style;
|
| - default_style.color = kExplanatoryTextColor;
|
| + default_style.color = GetExplanatoryTextColor();
|
| help_label_->SetDefaultStyle(default_style);
|
|
|
| views::StyledLabel::RangeStyleInfo link_style =
|
| views::StyledLabel::RangeStyleInfo::CreateForLink();
|
| - link_style.color = kLinkColor;
|
| + link_style.color = PasswordGenerationPopupView::GetLinkColor();
|
| help_label_->AddStyleRange(controller_->HelpTextLinkRange(), link_style);
|
|
|
| help_label_->SetBoundsRect(controller_->help_bounds());
|
| help_label_->set_background(
|
| - views::Background::CreateSolidBackground(kExplanatoryTextBackground));
|
| + views::Background::CreateSolidBackground(
|
| + PasswordGenerationPopupView::GetExplanatoryTextBackgroundColor()));
|
| help_label_->SetBorder(views::Border::CreateEmptyBorder(
|
| controller_->kHelpVerticalPadding - kHelpVerticalOffset,
|
| controller_->kHorizontalPadding,
|
| @@ -163,7 +160,7 @@ void PasswordGenerationPopupViewViews::OnPaint(gfx::Canvas* canvas) {
|
| // Divider line needs to be drawn after OnPaint() otherwise the background
|
| // will overwrite the divider.
|
| if (password_view_)
|
| - canvas->FillRect(controller_->divider_bounds(), kDividerColor);
|
| + canvas->FillRect(controller_->divider_bounds(), GetDividerColor());
|
| }
|
|
|
| void PasswordGenerationPopupViewViews::StyledLabelLinkClicked(
|
|
|