chrome/android/java/src/org/chromium/chrome/browser/sync/SyncAccountSwitcher.java - Issue 2014833002: Show dialogs for syncing to managed accounts.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Replace getContext with getActivity in AccountManagementFragment. Created 4 years, 6 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/sync/ui/ConfirmImportSyncDataDialog.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 89f663a425f09cdcab16893c74d36bec73f68781..4944578f98750c01b88da9ff94848a0e98298e39 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

@@ -12,10 +12,11 @@ import android.text.TextUtils;

import org.chromium.base.Callback;

import org.chromium.base.Promise;

import org.chromium.chrome.browser.preferences.SyncedAccountPreference;

+import org.chromium.chrome.browser.signin.ConfirmImportSyncDataDialog;

+import org.chromium.chrome.browser.signin.ConfirmImportSyncDataDialog.ImportSyncType;

+import org.chromium.chrome.browser.signin.ConfirmSyncDataStateMachine;

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;

/**

* A class that encapsulates the control flow of listeners and callbacks when switching sync

@@ -56,8 +57,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.