| Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java
|
| index c14a41635eda899f8be217492ddc0ed42d782744..0fc5156adab043f10f4ea2da0cd06cf8001169e3 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java
|
| @@ -10,11 +10,8 @@ import android.animation.AnimatorSet;
|
| import android.annotation.SuppressLint;
|
| import android.content.Context;
|
| import android.content.res.ColorStateList;
|
| -import android.graphics.Bitmap;
|
| -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;
|
| @@ -48,8 +45,6 @@ import javax.annotation.Nullable;
|
| * 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];
|
| @@ -73,8 +68,6 @@ abstract class ToolbarLayout extends FrameLayout implements Toolbar {
|
| private boolean mNativeLibraryReady;
|
| private boolean mUrlHasFocus;
|
|
|
| - private long mFirstDrawTimeMs;
|
| -
|
| protected final int mToolbarHeightWithoutShadow;
|
|
|
| private boolean mFindInPageToolbarShowing;
|
| @@ -239,12 +232,6 @@ abstract class ToolbarLayout extends FrameLayout implements Toolbar {
|
| }
|
|
|
| @Override
|
| - protected void onDraw(Canvas canvas) {
|
| - super.onDraw(canvas);
|
| - recordFirstDrawTime();
|
| - }
|
| -
|
| - @Override
|
| protected void onAttachedToWindow() {
|
| super.onAttachedToWindow();
|
| if (mProgressBar != null) {
|
| @@ -449,9 +436,9 @@ abstract class ToolbarLayout extends FrameLayout implements Toolbar {
|
|
|
| /**
|
| * Sets/adds a custom action button to the {@link ToolbarLayout} if it is supported.
|
| + * @param drawable The {@link Drawable} to use as the background for the button.
|
| * @param description The content description for the button.
|
| * @param listener The {@link OnClickListener} to use for clicks to the button.
|
| - * @param buttonSource The {@link Bitmap} resource to use as the source for the button.
|
| */
|
| public void setCustomActionButton(Drawable drawable, String description,
|
| OnClickListener listener) { }
|
| @@ -556,20 +543,6 @@ abstract class ToolbarLayout extends FrameLayout implements Toolbar {
|
| }
|
|
|
| /**
|
| - * Keeps track of the first time the toolbar is drawn.
|
| - */
|
| - private void recordFirstDrawTime() {
|
| - if (mFirstDrawTimeMs == 0) mFirstDrawTimeMs = SystemClock.elapsedRealtime();
|
| - }
|
| -
|
| - /**
|
| - * Returns the elapsed realtime in ms of the time at which first draw for the toolbar occurred.
|
| - */
|
| - public long getFirstDrawTime() {
|
| - return mFirstDrawTimeMs;
|
| - }
|
| -
|
| - /**
|
| * Notified when a navigation to a different page has occurred.
|
| */
|
| protected void onNavigatedToDifferentPage() {
|
|
|