Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2883)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/sync/SyncAccountSwitcher.java

Issue 2014833002: Show dialogs for syncing to managed accounts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/sync/SyncAccountSwitcher.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncAccountSwitcher.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncAccountSwitcher.java
index 10c5ebf756abeb35131d2d3f01f5fc4620017ec5..2d11118390e3880398694e7aa575905a13957033 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncAccountSwitcher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncAccountSwitcher.java
@@ -14,6 +14,7 @@ import org.chromium.chrome.browser.signin.SigninManager;
import org.chromium.chrome.browser.signin.SigninManager.SignInCallback;
import org.chromium.chrome.browser.sync.ui.ConfirmImportSyncDataDialog;
import org.chromium.chrome.browser.sync.ui.ConfirmImportSyncDataDialog.ImportSyncType;
+import org.chromium.chrome.browser.sync.ui.ConfirmSyncDataStateMachine;
/**
* A class that encapsulates the control flow of listeners and callbacks when switching sync
@@ -54,8 +55,10 @@ public class SyncAccountSwitcher
if (TextUtils.equals(mNewAccountName, currentAccount)) return false;
- ConfirmImportSyncDataDialog.showNewInstance(currentAccount, mNewAccountName,
- ImportSyncType.SWITCHING_SYNC_ACCOUNTS, mActivity.getFragmentManager(), this);
+ ConfirmSyncDataStateMachine.run(currentAccount, mNewAccountName,
+ ImportSyncType.SWITCHING_SYNC_ACCOUNTS, mActivity.getFragmentManager(),
+ mActivity, this);
+
// Don't update the selected account in the preference. It will be updated by
// the call to mSyncAccountListPreference.update() if everything succeeds.

Powered by Google App Engine
This is Rietveld 408576698