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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncedAccountPreference.java

Issue 1745563002: Revert of Created the dialog offering the user to merge their account data or keep it (Closed) Base URL: maybelle.lon.corp.google.com:/usr/local/google/code/clankium/src@sync_settings
Patch Set: Created 4 years, 10 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/preferences/SyncedAccountPreference.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncedAccountPreference.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncedAccountPreference.java
index 9251e9d1f317c6fbad5a60bfda69cf5b0b988ee9..9a7f8ff9fe92613900b8c53c4bca72bec681b0fb 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncedAccountPreference.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncedAccountPreference.java
@@ -17,10 +17,9 @@
/**
* A preference that displays the account currently being synced and allows the user to choose a new
- * account to use for syncing. The values used are the account names.
+ * account to use for syncing
*/
public class SyncedAccountPreference extends ListPreference {
- private static final String TAG = "SyncedAccountPreference";
/**
* Constructor for inflating from XML
@@ -28,14 +27,6 @@
public SyncedAccountPreference(Context context, AttributeSet attrs) {
super(context, attrs);
setTitle(context.getResources().getString(R.string.sync_to_account_header));
- updateAccountsList();
- }
-
- /**
- * Updates the list of accounts to those currently signed in and sets the display to the
- * current sync account.
- */
- public void update() {
updateAccountsList();
}
@@ -66,12 +57,13 @@
setEntries(accountNames);
setEntryValues(accountValues);
- setValue(signedInSettingsKey);
+ setDefaultValue(signedInSettingsKey);
setSummary(signedInAccountName);
}
@Override
protected void onDialogClosed(boolean positiveResult) {
super.onDialogClosed(positiveResult);
+ // TODO(crbug/557786): Add switching sync accounts
}
}

Powered by Google App Engine
This is Rietveld 408576698