chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java - Issue 1745563002: Revert of Created the dialog offering the user to merge their account data or keep it

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/ui/SyncCustomizationFragment.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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/sync/ui/ConfirmImportSyncDataDialog.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/widget/RadioButtonWithDescription.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/ui/SyncCustomizationFragment.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java

index 2afc507e8e39ad5bc44277921d14e7066edd859a..c19c7c9aedee89a2ed0146077326294b9db64f8c 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java

@@ -36,7 +36,6 @@

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

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

import org.chromium.chrome.browser.sync.ProfileSyncService;

-import org.chromium.chrome.browser.sync.SyncAccountSwitcher;

import org.chromium.sync.AndroidSyncSettings;

import org.chromium.sync.ModelType;

import org.chromium.sync.PassphraseType;

@@ -117,13 +116,12 @@

private Preference mSyncEncryption;

private Preference mManageSyncData;

private CheckBoxPreference[] mAllTypes;

- private SyncedAccountPreference mSyncedAccountPreference;

private ProfileSyncService mProfileSyncService;

@Override

- public View onCreateView(

- LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {

+ public View onCreateView(LayoutInflater inflater, ViewGroup container,

+ Bundle savedInstanceState) {

mProfileSyncService = ProfileSyncService.get();

assert mProfileSyncService != null;

mIsBackendInitialized = mProfileSyncService.isBackendInitialized();

@@ -180,11 +178,6 @@

}

});

- mSyncedAccountPreference =

- (SyncedAccountPreference) findPreference(PREFERENCE_SYNC_ACCOUNT_LIST);

- mSyncedAccountPreference.setOnPreferenceChangeListener(

- new SyncAccountSwitcher(getActivity(), mSyncedAccountPreference));

return view;

}