[Home] Use a taller progress bar

chrome/android/java/src/org/chromium/chrome/browser/widget/ToolbarProgressBar.java

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 fdaa3a83c9c376ab5c3a67da5b4d17cb93275b98..b7f28d41b0fa8ab213e342a186de8740fba66499 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
@@ -64,7 +64,6 @@ public class ToolbarProgressBar extends ClipDrawableProgressBar {
     private static final long ANIMATION_START_THRESHOLD = 5000;
 
     private static final float THEMED_BACKGROUND_WHITE_FRACTION = 0.2f;
-    private static final float THEMED_FOREGROUND_BLACK_FRACTION = 0.64f;
     private static final float ANIMATION_WHITE_FRACTION = 0.4f;
 
     private static final long PROGRESS_FRAME_TIME_CAP_MS = 50;
@@ -81,6 +80,9 @@ public class ToolbarProgressBar extends ClipDrawableProgressBar {
     private int mProgressStartCount;
     private int mThemeColor;
 
+    /** Whether or not this progress bar can use theme colors. */
+    private boolean mCanUseThemes;
+
     /** Whether the smooth-indeterminate animation is running. */
     private boolean mIsRunningSmoothIndeterminate;
 
@@ -143,12 +145,15 @@ public class ToolbarProgressBar extends ClipDrawableProgressBar {
      * Creates a toolbar progress bar.
      *
      * @param context The application environment.
+     * @param height The height of the progress bar in px.
      * @param topMargin The top margin of the progress bar.
+     * @param canUseThemes Whether or not this progress bar will apply theme colors when requested.
      */
-    public ToolbarProgressBar(Context context, int topMargin) {
-        super(context);
+    public ToolbarProgressBar(Context context, int height, int topMargin, boolean canUseThemes) {
+        super(context, height);
         setAlpha(0.0f);
         mMarginTop = topMargin;
+        mCanUseThemes = canUseThemes;
 
         // This tells accessibility services that progress bar changes are important enough to
         // announce to the user even when not focused.
@@ -385,10 +390,11 @@ public class ToolbarProgressBar extends ClipDrawableProgressBar {
      */
     public void setThemeColor(int color, boolean isIncognito) {
         mThemeColor = color;
+        boolean isDefaultTheme = ColorUtils.isUsingDefaultToolbarColor(getResources(), color);
 
         // The default toolbar has specific colors to use.
-        if ((ColorUtils.isUsingDefaultToolbarColor(getResources(), color)
-                || !ColorUtils.isValidThemeColor(color)) && !isIncognito) {
+        if (!mCanUseThemes
+                || ((isDefaultTheme || !ColorUtils.isValidThemeColor(color)) && !isIncognito)) {
             setForegroundColor(ApiCompatibilityUtils.getColor(getResources(),
                     R.color.progress_bar_foreground));
             setBackgroundColor(ApiCompatibilityUtils.getColor(getResources(),