Revert of [Andorid] Migrate to ClipDrawable progress bar.

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.toolbar;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.SystemClock;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.Tab;
 import org.chromium.chrome.browser.appmenu.AppMenuButtonHelper;
 import org.chromium.chrome.browser.compositor.Invalidator;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.omnibox.LocationBar;
 import org.chromium.chrome.browser.util.ViewUtils;
+import org.chromium.chrome.browser.widget.SmoothProgressBar;
 import org.chromium.chrome.browser.widget.TintedImageButton;
-import org.chromium.chrome.browser.widget.ToolbarProgressBar;
 import org.chromium.ui.UiUtils;
 
 /**
  * Layout class that contains the base shared logic for manipulating the toolbar component. For
  * interaction that are not from Views inside Toolbar hierarchy all interactions should be done
  * through {@link Toolbar} rather than using this class directly.
  */
 abstract class ToolbarLayout extends FrameLayout implements Toolbar {
     protected static final int BACKGROUND_TRANSITION_DURATION_MS = 400;
 
     private Invalidator mInvalidator;
 
     private final int[] mTempPosition = new int[2];
 
     /**
      * The ImageButton view that represents the menu button.
      */
     protected TintedImageButton mMenuButton;
     private AppMenuButtonHelper mAppMenuButtonHelper;
 
     private ToolbarDataProvider mToolbarDataProvider;
     private ToolbarTabController mToolbarTabController;
-    private ToolbarProgressBar mProgressBar;
+    private SmoothProgressBar mProgressBar;
 
     private boolean mNativeLibraryReady;
     private boolean mUrlHasFocus;
 
     private long mFirstDrawTimeMs;
 
     protected final int mToolbarHeightWithoutShadow;
 
     private boolean mFindInPageToolbarShowing;
 
     /**
      * Basic constructor for {@link ToolbarLayout}.
      */
     public ToolbarLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
         mToolbarHeightWithoutShadow = getResources().getDimensionPixelOffset(
                 getToolbarHeightWithoutShadowResId());
     }
 
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
 
-        mProgressBar = (ToolbarProgressBar) findViewById(R.id.progress);
+        mProgressBar = (SmoothProgressBar) findViewById(R.id.progress);
         if (mProgressBar != null) {
             removeView(mProgressBar);
+            Drawable progressDrawable = mProgressBar.getProgressDrawable();
             getFrameLayoutParams(mProgressBar).topMargin = mToolbarHeightWithoutShadow
-                    - getFrameLayoutParams(mProgressBar).height;
+                    - progressDrawable.getIntrinsicHeight();
         }
 
         mMenuButton = (TintedImageButton) findViewById(R.id.menu_button);
         // Initialize the provider to an empty version to avoid null checking everywhere.
         mToolbarDataProvider = new ToolbarDataProvider() {
             @Override
             public boolean isIncognito() {
                 return false;
             }
 
@@ skipping 11 matching lines @@
             public boolean wouldReplaceURL() {
                 return false;
             }
 
             @Override
             public NewTabPage getNewTabPageForCurrentTab() {
                 return null;
             }
 
             @Override
+            public int getLoadProgress() {
+                return 0;
+            }
+
+            @Override
             public String getCorpusChipText() {
                 return null;
             }
 
             @Override
             public int getPrimaryColor() {
                 return 0;
             }
 
             @Override
@@ skipping 50 matching lines @@
     /**
      * @return The menu button view.
      */
     protected View getMenuButton() {
         return mMenuButton;
     }
 
     /**
      * @return The {@link ProgressBar} this layout uses.
      */
-    ToolbarProgressBar getProgressBar() {
+    SmoothProgressBar getProgressBar() {
         return mProgressBar;
     }
 
     @Override
     public void getPositionRelativeToContainer(View containerView, int[] position) {
         ViewUtils.getRelativeDrawPosition(containerView, this, position);
     }
 
     /**
      * @return The helper for menu button UI interactions.
@@ skipping 296 matching lines @@
         return mFirstDrawTimeMs;
     }
 
     /**
      * Notified when a navigation to a different page has occurred.
      */
     protected void onNavigatedToDifferentPage() {
     }
 
     /**
-     * Starts load progress.
-     */
-    protected void startLoadProgress() {
-        if (mProgressBar != null) {
-            mProgressBar.start();
-        }
-    }
-
-    /**
      * Sets load progress.
-     * @param progress The load progress between 0 and 1.
+     * @param progress The load progress between 0 and 100.
      */
-    protected void setLoadProgress(float progress) {
-        if (mProgressBar != null) {
-            mProgressBar.setProgress(progress);
-        }
+    protected void setLoadProgress(int progress) {
+        if (mProgressBar != null) mProgressBar.setProgress(progress);
     }
 
     /**
-     * Finishes load progress.
-     * @param delayed Whether hiding progress bar should be delayed to give enough time for user to
-     *                        recognize the last state.
-     */
-    protected void finishLoadProgress(boolean delayed) {
-        if (mProgressBar != null) {
-            mProgressBar.finish(delayed);
-        }
-    }
-
-    /**
      * Finish any toolbar animations.
      */
     public void finishAnimations() { }
 
     /**
      * @return The current View showing in the Tab.
      */
     protected View getCurrentTabView() {
         Tab tab = mToolbarDataProvider.getTab();
         if (tab != null) {
@@ skipping 44 matching lines @@
     }
 
     /**
      * Opens hompage in the current tab.
      */
     protected void openHomepage() {
         getLocationBar().hideSuggestions();
         if (mToolbarTabController != null) mToolbarTabController.openHomepage();
     }
 }