| Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
| index 7064085f1228185c6b57b0f80e03aa0706d421fe..aef8c528c2aa5e4dca1afea4b60dabf7b492ec20 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
| @@ -97,6 +97,7 @@ import org.chromium.chrome.browser.share.ShareHelper;
|
| import org.chromium.chrome.browser.snackbar.LoFiBarPopupController;
|
| import org.chromium.chrome.browser.snackbar.SnackbarManager;
|
| import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
|
| +import org.chromium.chrome.browser.snackbar.smartlockautosignin.AutoSigninSnackbarController;
|
| import org.chromium.chrome.browser.sync.ProfileSyncService;
|
| import org.chromium.chrome.browser.tab.EmptyTabObserver;
|
| import org.chromium.chrome.browser.tab.Tab;
|
| @@ -195,6 +196,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
|
| private ProfileSyncService.SyncStateChangedListener mSyncStateChangedListener;
|
|
|
| private ActivityWindowAndroid mWindowAndroid;
|
| + private AutoSigninSnackbarController mAutoSigninSnackbarController;
|
| private ChromeFullscreenManager mFullscreenManager;
|
| private CompositorViewHolder mCompositorViewHolder;
|
| private ContextualSearchManager mContextualSearchManager;
|
| @@ -477,11 +479,13 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
|
| @Override
|
| public void onHidden(Tab tab) {
|
| mLoFiBarPopupController.dismissLoFiBar();
|
| + mAutoSigninSnackbarController.dismissAutoSigninToast();
|
| }
|
|
|
| @Override
|
| public void onDestroyed(Tab tab) {
|
| mLoFiBarPopupController.dismissLoFiBar();
|
| + mAutoSigninSnackbarController.dismissAutoSigninToast();
|
| }
|
|
|
| @Override
|
| @@ -512,6 +516,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
|
| (ControlContainer) findViewById(R.id.control_container);
|
| controlContainer.getToolbarResourceAdapter().invalidate(null);
|
| }
|
| +
|
| + public void onSmartLockAutoSignIn(Object credential) {
|
| + mAutoSigninSnackbarController.show(credential);
|
| + }
|
| };
|
|
|
| if (mAssistStatusHandler != null) {
|
| @@ -535,6 +543,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
|
| } else {
|
| ContextReporter.reportStatus(ContextReporter.STATUS_GSA_NOT_AVAILABLE);
|
| }
|
| + mAutoSigninSnackbarController =
|
| + new AutoSigninSnackbarController(this, getSnackbarManager());
|
| mCompositorViewHolder.resetFlags();
|
| }
|
|
|
|
|