| Index: chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarManager.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarManager.java
|
| index 8b7da808841024b43f43ddd6b3ef2364709bea15..0c6ca7da0142e26f341976ad724b1260577d6228 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarManager.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarManager.java
|
| @@ -4,10 +4,10 @@
|
|
|
| package org.chromium.chrome.browser.snackbar;
|
|
|
| +import android.app.Activity;
|
| import android.os.Handler;
|
| import android.view.View;
|
| import android.view.View.OnClickListener;
|
| -import android.view.ViewGroup;
|
|
|
| import org.chromium.base.VisibleForTesting;
|
| import org.chromium.chrome.browser.device.DeviceClassManager;
|
| @@ -60,7 +60,7 @@ public class SnackbarManager implements OnClickListener {
|
| private static int sSnackbarDurationMs = DEFAULT_SNACKBAR_DURATION_MS;
|
| private static int sAccessibilitySnackbarDurationMs = ACCESSIBILITY_MODE_SNACKBAR_DURATION_MS;
|
|
|
| - private ViewGroup mParentView;
|
| + private Activity mActivity;
|
| private SnackbarView mView;
|
| private final Handler mUIThreadHandler;
|
| private SnackbarCollection mSnackbars = new SnackbarCollection();
|
| @@ -78,8 +78,8 @@ public class SnackbarManager implements OnClickListener {
|
| * Constructs a SnackbarManager to show snackbars in the given window.
|
| * @param rootView The main view (e.g. android.R.id.content) of the embedding activity.
|
| */
|
| - public SnackbarManager(ViewGroup rootView) {
|
| - mParentView = rootView;
|
| + public SnackbarManager(Activity activity) {
|
| + mActivity = activity;
|
| mUIThreadHandler = new Handler();
|
| }
|
|
|
| @@ -165,7 +165,7 @@ public class SnackbarManager implements OnClickListener {
|
| } else {
|
| boolean viewChanged = true;
|
| if (mView == null) {
|
| - mView = new SnackbarView(mParentView, this, currentSnackbar);
|
| + mView = new SnackbarView(mActivity, this, currentSnackbar);
|
| mView.show();
|
| } else {
|
| viewChanged = mView.update(currentSnackbar);
|
| @@ -184,7 +184,7 @@ public class SnackbarManager implements OnClickListener {
|
| private int getDuration(Snackbar snackbar) {
|
| int durationMs = snackbar.getDuration();
|
| if (durationMs == 0) {
|
| - durationMs = DeviceClassManager.isAccessibilityModeEnabled(mParentView.getContext())
|
| + durationMs = DeviceClassManager.isAccessibilityModeEnabled(mActivity)
|
| ? sAccessibilitySnackbarDurationMs : sSnackbarDurationMs;
|
| }
|
| return durationMs;
|
|
|