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

Side by Side 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, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.preferences; 5 package org.chromium.chrome.browser.preferences;
6 6
7 import android.content.Intent; 7 import android.content.Intent;
8 import android.os.Bundle; 8 import android.os.Bundle;
9 import android.os.Handler; 9 import android.os.Handler;
10 import android.preference.Preference; 10 import android.preference.Preference;
11 import android.preference.Preference.OnPreferenceClickListener; 11 import android.preference.Preference.OnPreferenceClickListener;
12 import android.preference.PreferenceFragment; 12 import android.preference.PreferenceFragment;
13 13
14 import org.chromium.base.ApplicationStatus;
15 import org.chromium.base.CommandLine;
14 import org.chromium.chrome.R; 16 import org.chromium.chrome.R;
17 import org.chromium.chrome.browser.ChromeSwitches;
15 import org.chromium.chrome.browser.PasswordUIView; 18 import org.chromium.chrome.browser.PasswordUIView;
16 import org.chromium.chrome.browser.autofill.PersonalDataManager; 19 import org.chromium.chrome.browser.autofill.PersonalDataManager;
17 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings; 20 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
18 import org.chromium.chrome.browser.partnercustomizations.HomepageManager; 21 import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
19 import org.chromium.chrome.browser.preferences.datareduction.DataReductionPrefer ences; 22 import org.chromium.chrome.browser.preferences.datareduction.DataReductionPrefer ences;
20 import org.chromium.chrome.browser.signin.AccountSigninActivity; 23 import org.chromium.chrome.browser.signin.AccountSigninActivity;
21 import org.chromium.chrome.browser.signin.SigninAccessPoint; 24 import org.chromium.chrome.browser.signin.SigninAccessPoint;
22 import org.chromium.chrome.browser.signin.SigninManager; 25 import org.chromium.chrome.browser.signin.SigninManager;
23 import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver; 26 import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
24 import org.chromium.chrome.browser.util.FeatureUtilities; 27 import org.chromium.chrome.browser.util.FeatureUtilities;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 } 99 }
97 100
98 mSignInPreference.setEnabled(false); 101 mSignInPreference.setEnabled(false);
99 SigninManager.logSigninStartAccessPoint(SigninAccessPoint.SETTIN GS); 102 SigninManager.logSigninStartAccessPoint(SigninAccessPoint.SETTIN GS);
100 startActivity(new Intent(getActivity(), AccountSigninActivity.cl ass)); 103 startActivity(new Intent(getActivity(), AccountSigninActivity.cl ass));
101 return true; 104 return true;
102 } 105 }
103 }); 106 });
104 mSignInPreference.setEnabled(true); 107 mSignInPreference.setEnabled(true);
105 108
109 // TODO(dfalcantara): Delete this preference entirely. https://crbug.co m/582539
106 Preference documentMode = findPreference(PREF_DOCUMENT_MODE); 110 Preference documentMode = findPreference(PREF_DOCUMENT_MODE);
107 if (FeatureUtilities.isDocumentModeEligible(getActivity())) { 111 boolean showDocumentToggle = FeatureUtilities.isDocumentModeEligible(get Activity());
112 if (CommandLine.getInstance().hasSwitch(ChromeSwitches.ENABLE_FORCED_MIG RATION)) {
113 showDocumentToggle &=
114 FeatureUtilities.isDocumentMode(ApplicationStatus.getApplica tionContext());
115 }
116 if (showDocumentToggle) {
108 setOnOffSummary(documentMode, 117 setOnOffSummary(documentMode,
109 !DocumentModeManager.getInstance(getActivity()).isOptedOutOf DocumentMode()); 118 !DocumentModeManager.getInstance(getActivity()).isOptedOutOf DocumentMode());
110 } else { 119 } else {
111 getPreferenceScreen().removePreference(documentMode); 120 getPreferenceScreen().removePreference(documentMode);
112 } 121 }
113 122
114 ChromeBasePreference autofillPref = 123 ChromeBasePreference autofillPref =
115 (ChromeBasePreference) findPreference(PREF_AUTOFILL_SETTINGS); 124 (ChromeBasePreference) findPreference(PREF_AUTOFILL_SETTINGS);
116 setOnOffSummary(autofillPref, PersonalDataManager.isAutofillEnabled()); 125 setOnOffSummary(autofillPref, PersonalDataManager.isAutofillEnabled());
117 autofillPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); 126 autofillPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 if (PREF_DATA_REDUCTION.equals(preference.getKey())) { 220 if (PREF_DATA_REDUCTION.equals(preference.getKey())) {
212 DataReductionProxySettings settings = DataReductionProxySett ings.getInstance(); 221 DataReductionProxySettings settings = DataReductionProxySett ings.getInstance();
213 return settings.isDataReductionProxyManaged() 222 return settings.isDataReductionProxyManaged()
214 && !settings.isDataReductionProxyEnabled(); 223 && !settings.isDataReductionProxyEnabled();
215 } 224 }
216 return super.isPreferenceClickDisabledByPolicy(preference); 225 return super.isPreferenceClickDisabledByPolicy(preference);
217 } 226 }
218 }; 227 };
219 } 228 }
220 } 229 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698