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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.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/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 0f627816c9182b78492fb72fe7b6e485b152469f..d696e455125cd453a03fa4e086ca5b4106f1b5ff 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
@@ -27,7 +27,7 @@ import org.chromium.chrome.browser.signin.AccountTrackerService.OnSystemAccounts
import org.chromium.chrome.browser.sync.SyncUserDataWiper;
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.sync.ui.ConfirmSyncDataStateMachine;
import org.chromium.sync.signin.AccountManagerHelper;
import org.chromium.ui.text.NoUnderlineClickableSpan;
import org.chromium.ui.text.SpanApplier;
@@ -372,33 +372,28 @@ 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) {
- if (wipeData) {
- SyncUserDataWiper.wipeSyncUserData(new Runnable(){
- @Override
- public void run() {
- showConfirmSigninPage();
- }
- });
- } else {
- showConfirmSigninPage();
- }
+ ConfirmSyncDataStateMachine.run(PrefServiceBridge.getInstance().getSyncLastAccountName(),
+ accountName, ImportSyncType.PREVIOUS_DATA_FOUND, mDelegate.getFragmentManager(),
+ getContext(), new ConfirmImportSyncDataDialog.Listener() {
+ @Override
+ public void onConfirm(boolean wipeData) {
+ if (wipeData) {
+ SyncUserDataWiper.wipeSyncUserData(new Runnable(){
+ @Override
+ public void run() {
+ showConfirmSigninPage();
+ }
+ });
+ } else {
+ showConfirmSigninPage();
}
+ }
- @Override
- public void onCancel() {
- setButtonsEnabled(true);
- }
- });
- } else {
- showConfirmSigninPage();
- }
+ @Override
+ public void onCancel() {
+ setButtonsEnabled(true);
+ }
+ });
}
private void setUpCancelButton() {

Powered by Google App Engine
This is Rietveld 408576698