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 a53e769873d6a71f0c44a870b4d81bc3287d0a1f..ac42aea213e1392a956c0a87e9e7fcbad1630ecb 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 |
@@ -106,6 +106,12 @@ public class ToolbarProgressBar extends ClipDrawableProgressBar { |
mAnimationLogic = new ProgressAnimationSmooth(); |
} else if (TextUtils.equals(animation, "fast-start")) { |
mAnimationLogic = new ProgressAnimationFastStart(); |
+ } else if (TextUtils.equals(animation, "linear")) { |
+ mAnimationLogic = new ProgressAnimationLinear(); |
+ } else { |
+ assert animation == null |
Ted C
2015/08/07 23:11:00
Maybe just this instead of the two checks?
http://
Kibeom Kim (inactive)
2015/08/07 23:35:34
Done.
|
+ || animation.isEmpty() |
+ || TextUtils.equals(animation, "disabled"); |
} |
} |