diff options
| author | treib <treib@chromium.org> | 2015-04-17 05:32:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-17 12:33:10 +0000 |
| commit | 2b18805daa18a3bc4d9892f50e44d5cfacdad451 (patch) | |
| tree | 2e0c35f96ed15ea24d6cdda72156883ef96d3f74 /chrome/browser/android/preferences | |
| parent | 6ab822eb229fcf3133e96680f284d899b64da10d (diff) | |
| download | chromium_src-2b18805daa18a3bc4d9892f50e44d5cfacdad451.zip chromium_src-2b18805daa18a3bc4d9892f50e44d5cfacdad451.tar.gz chromium_src-2b18805daa18a3bc4d9892f50e44d5cfacdad451.tar.bz2 | |
Enterprise policy: Ignore the deprecated ForceSafeSearch if ForceGoogleSafeSearch or ForceYoutubeSafetyMode are enabled
While we're here, remove the deprecated prefs::kForceSafeSearch and instead map the old policy to the new prefs
TBR=cbentzel@chromium.org for trivial io_thread.cc change
BUG=476908
Review URL: https://codereview.chromium.org/1056003003
Cr-Commit-Position: refs/heads/master@{#325620}
Diffstat (limited to 'chrome/browser/android/preferences')
| -rw-r--r-- | chrome/browser/android/preferences/pref_service_bridge.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc index e16dc42e..189bab0 100644 --- a/chrome/browser/android/preferences/pref_service_bridge.cc +++ b/chrome/browser/android/preferences/pref_service_bridge.cc @@ -344,8 +344,8 @@ static jboolean GetCrashReportManaged(JNIEnv* env, jobject obj) { prefs::kCrashReportingEnabled); } -static jboolean GetForceSafeSearch(JNIEnv* env, jobject obj) { - return GetPrefService()->GetBoolean(prefs::kForceSafeSearch); +static jboolean GetForceGoogleSafeSearch(JNIEnv* env, jobject obj) { + return GetPrefService()->GetBoolean(prefs::kForceGoogleSafeSearch); } static jint GetDefaultSupervisedUserFilteringBehavior(JNIEnv* env, |