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

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java

Issue 1901623002: Unified Bookmarks and Recent Tabs signin methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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;
8 import android.os.Bundle; 7 import android.os.Bundle;
9 import android.os.Handler; 8 import android.os.Handler;
10 import android.preference.Preference; 9 import android.preference.Preference;
11 import android.preference.Preference.OnPreferenceClickListener; 10 import android.preference.Preference.OnPreferenceClickListener;
12 import android.preference.PreferenceFragment; 11 import android.preference.PreferenceFragment;
13 12
14 import org.chromium.chrome.R; 13 import org.chromium.chrome.R;
15 import org.chromium.chrome.browser.PasswordUIView; 14 import org.chromium.chrome.browser.PasswordUIView;
16 import org.chromium.chrome.browser.autofill.PersonalDataManager; 15 import org.chromium.chrome.browser.autofill.PersonalDataManager;
17 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings; 16 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 public boolean onPreferenceClick(Preference preference) { 87 public boolean onPreferenceClick(Preference preference) {
89 if (ChromeSigninController.get(getActivity()).isSignedIn()) retu rn false; 88 if (ChromeSigninController.get(getActivity()).isSignedIn()) retu rn false;
90 if (!SigninManager.get(getActivity()).isSignInAllowed()) { 89 if (!SigninManager.get(getActivity()).isSignInAllowed()) {
91 if (SigninManager.get(getActivity()).isSigninDisabledByPolic y()) { 90 if (SigninManager.get(getActivity()).isSigninDisabledByPolic y()) {
92 ManagedPreferencesUtils.showManagedByAdministratorToast( getActivity()); 91 ManagedPreferencesUtils.showManagedByAdministratorToast( getActivity());
93 } 92 }
94 return false; 93 return false;
95 } 94 }
96 95
97 mSignInPreference.setEnabled(false); 96 mSignInPreference.setEnabled(false);
98 SigninManager.logSigninStartAccessPoint(SigninAccessPoint.SETTIN GS); 97 AccountSigninActivity
99 startActivity(new Intent(getActivity(), AccountSigninActivity.cl ass)); 98 .startAccountSigninActivity(getActivity(), SigninAccessP oint.SETTINGS);
100 return true; 99 return true;
101 } 100 }
102 }); 101 });
103 mSignInPreference.setEnabled(true); 102 mSignInPreference.setEnabled(true);
104 103
105 ChromeBasePreference autofillPref = 104 ChromeBasePreference autofillPref =
106 (ChromeBasePreference) findPreference(PREF_AUTOFILL_SETTINGS); 105 (ChromeBasePreference) findPreference(PREF_AUTOFILL_SETTINGS);
107 setOnOffSummary(autofillPref, PersonalDataManager.isAutofillEnabled()); 106 setOnOffSummary(autofillPref, PersonalDataManager.isAutofillEnabled());
108 autofillPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); 107 autofillPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
109 108
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 if (PREF_DATA_REDUCTION.equals(preference.getKey())) { 201 if (PREF_DATA_REDUCTION.equals(preference.getKey())) {
203 DataReductionProxySettings settings = DataReductionProxySett ings.getInstance(); 202 DataReductionProxySettings settings = DataReductionProxySett ings.getInstance();
204 return settings.isDataReductionProxyManaged() 203 return settings.isDataReductionProxyManaged()
205 && !settings.isDataReductionProxyEnabled(); 204 && !settings.isDataReductionProxyEnabled();
206 } 205 }
207 return super.isPreferenceClickDisabledByPolicy(preference); 206 return super.isPreferenceClickDisabledByPolicy(preference);
208 } 207 }
209 }; 208 };
210 } 209 }
211 } 210 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698