From dc3612d7aeccf1126d7a83bae567a26dc52dde01 Mon Sep 17 00:00:00 2001 From: estade Date: Mon, 4 May 2015 15:02:18 -0700 Subject: [PATCH] Linux - support system theme colorizing for progress text and spinner in CVC prompt dialog. BUG=465578 Review URL: https://codereview.chromium.org/1122773003 Cr-Commit-Position: refs/heads/master@{#328200} --- chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc | 6 +++++- chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc | 4 ++-- ui/views/controls/throbber.cc | 6 ++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc index fc8ba3b4783e..9ad4b8fb84ff 100644 --- a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc +++ b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc @@ -405,7 +405,11 @@ GdkColor NativeThemeGtk2::GetSystemGdkColor(ColorId color_id) const { return GetReadableColor(kNegativeTextColor, GetEntryStyle()->base[GTK_STATE_SELECTED]); } - case kColorId_ThrobberSpinningColor: + + // Throbber + case kColorId_ThrobberSpinningColor: { + return GetEntryStyle()->bg[GTK_STATE_SELECTED]; + } case kColorId_ThrobberWaitingColor: case kColorId_NumColors: NOTREACHED(); diff --git a/chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc b/chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc index c3f45add4f49..1d9f307a1688 100644 --- a/chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc +++ b/chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc @@ -232,6 +232,8 @@ void CardUnmaskPromptViews::OnNativeThemeChanged(const ui::NativeTheme* theme) { progress_overlay_->set_background( views::Background::CreateSolidBackground(bg_color)); progress_label_->SetBackgroundColor(bg_color); + progress_label_->SetEnabledColor(theme->GetSystemColor( + ui::NativeTheme::kColorId_ThrobberSpinningColor)); } ui::ModalType CardUnmaskPromptViews::GetModalType() const { @@ -440,8 +442,6 @@ void CardUnmaskPromptViews::InitIfNecessary() { progress_label_ = new views::Label(l10n_util::GetStringUTF16( IDS_AUTOFILL_CARD_UNMASK_VERIFICATION_IN_PROGRESS)); - // Material blue. TODO(estade): find an appropriate place for this color. - progress_label_->SetEnabledColor(SkColorSetRGB(0x42, 0x85, 0xF4)); progress_overlay_->AddChildView(progress_label_); } diff --git a/ui/views/controls/throbber.cc b/ui/views/controls/throbber.cc index 1a8e38c34f8d..dc4643366178 100644 --- a/ui/views/controls/throbber.cc +++ b/ui/views/controls/throbber.cc @@ -71,10 +71,8 @@ void Throbber::OnPaint(gfx::Canvas* canvas) { return; } - SkColor color; - bool found_color = ui::CommonThemeGetSystemColor( - ui::NativeTheme::kColorId_ThrobberSpinningColor, &color); - DCHECK(found_color); + SkColor color = GetNativeTheme()->GetSystemColor( + ui::NativeTheme::kColorId_ThrobberSpinningColor); base::TimeDelta elapsed_time = base::TimeTicks::Now() - start_time_; gfx::PaintThrobberSpinning(canvas, GetContentsBounds(), color, elapsed_time); } -- 2.11.4.GIT