| 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..ed4e791b6c1bb33891adb0ab6b43de06b6279318 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,10 @@ 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 TextUtils.isEmpty(animation) || TextUtils.equals(animation, "disabled");
|
| }
|
| }
|
|
|
|
|