| Index: chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java
|
| index fe9668fbbf70ec03ea6090c34496e575483e10a7..317139e701a3013219d63422ba6d829697204494 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java
|
| @@ -25,9 +25,7 @@ import org.chromium.chrome.browser.ntp.NtpColorUtils;
|
| import org.chromium.chrome.browser.preferences.PrefServiceBridge;
|
| import org.chromium.chrome.browser.profiles.ProfileDownloader;
|
| import org.chromium.chrome.browser.signin.AccountTrackerService.OnSystemAccountsSeededListener;
|
| -import org.chromium.chrome.browser.sync.ui.ConfirmImportSyncDataDialog;
|
| -import org.chromium.chrome.browser.sync.ui.ConfirmImportSyncDataDialog.ImportSyncType;
|
| -import org.chromium.signin.InvestigatedScenario;
|
| +import org.chromium.chrome.browser.signin.ConfirmImportSyncDataDialog.ImportSyncType;
|
| import org.chromium.sync.signin.AccountManagerHelper;
|
| import org.chromium.ui.text.NoUnderlineClickableSpan;
|
| import org.chromium.ui.text.SpanApplier;
|
| @@ -372,30 +370,25 @@ public class AccountSigninView extends FrameLayout implements ProfileDownloader.
|
|
|
| private void showConfirmSigninPagePreviousAccountCheck() {
|
| String accountName = getSelectedAccountName();
|
| - if (SigninInvestigator.investigate(accountName) == InvestigatedScenario.DIFFERENT_ACCOUNT) {
|
| - ConfirmImportSyncDataDialog.showNewInstance(
|
| - PrefServiceBridge.getInstance().getSyncLastAccountName(), accountName,
|
| - ImportSyncType.PREVIOUS_DATA_FOUND, mDelegate.getFragmentManager(),
|
| - new ConfirmImportSyncDataDialog.Listener() {
|
| - @Override
|
| - public void onConfirm(boolean wipeData) {
|
| - SigninManager.wipeSyncUserDataIfRequired(wipeData)
|
| - .then(new Callback<Void>() {
|
| - @Override
|
| - public void onResult(Void v) {
|
| - showConfirmSigninPage();
|
| - }
|
| - });
|
| - }
|
| + ConfirmSyncDataStateMachine.run(PrefServiceBridge.getInstance().getSyncLastAccountName(),
|
| + accountName, ImportSyncType.PREVIOUS_DATA_FOUND, mDelegate.getFragmentManager(),
|
| + getContext(), new ConfirmImportSyncDataDialog.Listener() {
|
| + @Override
|
| + public void onConfirm(boolean wipeData) {
|
| + SigninManager.wipeSyncUserDataIfRequired(wipeData)
|
| + .then(new Callback<Void>() {
|
| + @Override
|
| + public void onResult(Void v) {
|
| + showConfirmSigninPage();
|
| + }
|
| + });
|
| + }
|
|
|
| - @Override
|
| - public void onCancel() {
|
| - setButtonsEnabled(true);
|
| - }
|
| - });
|
| - } else {
|
| - showConfirmSigninPage();
|
| - }
|
| + @Override
|
| + public void onCancel() {
|
| + setButtonsEnabled(true);
|
| + }
|
| + });
|
| }
|
|
|
| private void setUpCancelButton() {
|
|
|