chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java - Issue 1056003003: Policy: Ignore ForceSafeSearch if ForceGoogleSafeSearch or ForceYoutubeSafetyMode are enabled

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/signin/AccountManagementFragment.java

Issue 1056003003: Policy: Ignore ForceSafeSearch if ForceGoogleSafeSearch or ForceYoutubeSafetyMode are enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Android Created 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java ('k') | chrome/browser/android/preferences/pref_service_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java

index 60cd03f450b99fad7018eeea71edb58d83f1050a..6b59276c6140c8c51eb852927ebe8727437dd776 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java

@@ -345,7 +345,7 @@ public class AccountManagementFragment extends PreferenceFragment

childContent.setSelectable(false);

final String safeSearchText = res.getString(

- prefService.isForceSafeSearch() ? R.string.text_on : R.string.text_off);

+ prefService.isForceGoogleSafeSearch() ? R.string.text_on : R.string.text_off);

childSafeSearch.setSummary(safeSearchText);

childSafeSearch.setSelectable(false);

} else {