Commit ce58bfa0 authored by Peter Boström's avatar Peter Boström Committed by Commit Bot

Use blue for both throbber and loading animation

This makes use of COLOR_TAB_THROBBER_SPINNING in both the loading and
waiting states.

Bug: chromium:903457
Change-Id: I3e6bed8392c956604649c42eb8fcef1d10a7a8c9
Reviewed-on: https://chromium-review.googlesource.com/c/1329349Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607270}
parent 0be8c42f
...@@ -265,15 +265,15 @@ void TabIcon::PaintLoadingAnimation(gfx::Canvas* canvas, ...@@ -265,15 +265,15 @@ void TabIcon::PaintLoadingAnimation(gfx::Canvas* canvas,
const ui::ThemeProvider* tp = GetThemeProvider(); const ui::ThemeProvider* tp = GetThemeProvider();
if (UseNewLoadingAnimation()) { if (UseNewLoadingAnimation()) {
const gfx::RectF throbber_bounds = GetThrobberBounds(bounds); const gfx::RectF throbber_bounds = GetThrobberBounds(bounds);
// Note that this tab-loading animation intentionally uses
// COLOR_TAB_THROBBER_SPINNING for both the waiting and loading states.
const SkColor loading_color =
tp->GetColor(ThemeProperties::COLOR_TAB_THROBBER_SPINNING);
if (network_state_ == TabNetworkState::kWaiting) { if (network_state_ == TabNetworkState::kWaiting) {
gfx::PaintNewThrobberWaiting( gfx::PaintNewThrobberWaiting(canvas, throbber_bounds, loading_color,
canvas, throbber_bounds, waiting_state_.elapsed_time);
tp->GetColor(ThemeProperties::COLOR_TAB_THROBBER_WAITING),
waiting_state_.elapsed_time);
} else { } else {
PaintLoadingProgressIndicator( PaintLoadingProgressIndicator(canvas, throbber_bounds, loading_color);
canvas, throbber_bounds,
tp->GetColor(ThemeProperties::COLOR_TAB_THROBBER_SPINNING));
} }
} else { } else {
if (network_state_ == TabNetworkState::kWaiting) { if (network_state_ == TabNetworkState::kWaiting) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment