chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java - Issue 1885463002: Create a Promise class to simplify dealing with async results.

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/signin/AccountSigninView.java

Issue 1885463002: Create a Promise class to simplify dealing with async results. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove IntDef 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/ntp/interests/InterestsView.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.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/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..fe9668fbbf70ec03ea6090c34496e575483e10a7 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

@@ -17,6 +17,7 @@ import android.widget.ImageView;

import android.widget.TextView;

import org.chromium.base.ApiCompatibilityUtils;

+import org.chromium.base.Callback;

import org.chromium.base.metrics.RecordUserAction;

import org.chromium.chrome.R;

import org.chromium.chrome.browser.firstrun.ProfileDataCache;

@@ -24,7 +25,6 @@ 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.SyncUserDataWiper;

import org.chromium.chrome.browser.sync.ui.ConfirmImportSyncDataDialog;

import org.chromium.chrome.browser.sync.ui.ConfirmImportSyncDataDialog.ImportSyncType;

import org.chromium.signin.InvestigatedScenario;

@@ -379,16 +379,13 @@ public class AccountSigninView extends FrameLayout implements ProfileDownloader.

new ConfirmImportSyncDataDialog.Listener() {

@Override

public void onConfirm(boolean wipeData) {

- if (wipeData) {

- SyncUserDataWiper.wipeSyncUserData(new Runnable(){

- @Override

- public void run() {

- showConfirmSigninPage();

- }

- });

- } else {

- showConfirmSigninPage();

- }

+ SigninManager.wipeSyncUserDataIfRequired(wipeData)

+ .then(new Callback<Void>() {

+ @Override

+ public void onResult(Void v) {

+ showConfirmSigninPage();

+ }

+ });

}

@Override