| Index: chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java
|
| index be08b5d826b39a3b2b3108b0161e10fe49faf1f1..f02891b089b81ee39281ad97b3661d660392f78d 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java
|
| @@ -207,7 +207,7 @@ public class ToolbarProgressBar extends ClipDrawableProgressBar {
|
|
|
| // The primary theme color may not have been set.
|
| if (mThemeColor != 0) {
|
| - setThemeColor(mThemeColor, false);
|
| + setThemeColor(mThemeColor, false, false);
|
| } else {
|
| setForegroundColor(getForegroundColor());
|
| }
|
| @@ -358,12 +358,16 @@ public class ToolbarProgressBar extends ClipDrawableProgressBar {
|
| /**
|
| * Color the progress bar based on the toolbar theme color.
|
| * @param color The Android color the toolbar is using.
|
| + * @param forceDefaultTheme If, despite the theme color, the progress bar should use the
|
| + * default colors.
|
| + * @param isIncognito If the tab setting the theme is incognito.
|
| */
|
| - public void setThemeColor(int color, boolean isIncognito) {
|
| + public void setThemeColor(int color, boolean forceDefaultTheme, boolean isIncognito) {
|
| mThemeColor = color;
|
|
|
| // The default toolbar has specific colors to use.
|
| - if (ColorUtils.isUsingDefaultToolbarColor(getResources(), color) && !isIncognito) {
|
| + if ((ColorUtils.isUsingDefaultToolbarColor(getResources(), color) && !isIncognito)
|
| + || forceDefaultTheme) {
|
| setForegroundColor(ApiCompatibilityUtils.getColor(getResources(),
|
| R.color.progress_bar_foreground));
|
| setBackgroundColor(ApiCompatibilityUtils.getColor(getResources(),
|
|
|