chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java - Issue 1817083003: Add pathway to auto-migrate users when Chrome launches

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/preferences/MainPreferences.java

Issue 1817083003: Add pathway to auto-migrate users when Chrome launches (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@assassin

Patch Set: Comments Created 4 years, 9 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/init/AsyncInitializationActivity.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.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/preferences/MainPreferences.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java

index 2e655d14b8b951db14fcc34a7fd4667a6bcacff7..cf5469ab42e483c3d222248f37f58dc19c884a26 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java

@@ -11,7 +11,10 @@ import android.preference.Preference;

import android.preference.Preference.OnPreferenceClickListener;

import android.preference.PreferenceFragment;

+import org.chromium.base.ApplicationStatus;

+import org.chromium.base.CommandLine;

import org.chromium.chrome.R;

+import org.chromium.chrome.browser.ChromeSwitches;

import org.chromium.chrome.browser.PasswordUIView;

import org.chromium.chrome.browser.autofill.PersonalDataManager;

import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;

@@ -103,8 +106,14 @@ public class MainPreferences extends PreferenceFragment implements SignInStateOb

});

mSignInPreference.setEnabled(true);

+ // TODO(dfalcantara): Delete this preference entirely. https://crbug.com/582539

Preference documentMode = findPreference(PREF_DOCUMENT_MODE);

- if (FeatureUtilities.isDocumentModeEligible(getActivity())) {

+ boolean showDocumentToggle = FeatureUtilities.isDocumentModeEligible(getActivity());

+ if (CommandLine.getInstance().hasSwitch(ChromeSwitches.ENABLE_FORCED_MIGRATION)) {

+ showDocumentToggle &=

+ FeatureUtilities.isDocumentMode(ApplicationStatus.getApplicationContext());

+ }

+ if (showDocumentToggle) {

setOnOffSummary(documentMode,

!DocumentModeManager.getInstance(getActivity()).isOptedOutOfDocumentMode());

} else {