chrome/browser/android/preferences/pref_service_bridge.cc - Issue 1552333002: Resubmit Supervised user web restrictions content provider

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/browser/android/preferences/pref_service_bridge.cc

Issue 1552333002: Resubmit Supervised user web restrictions content provider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Manual rebase to fix merge problem Created 4 years, 11 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/browser/android/chrome_jni_registrar.cc ('k') | chrome/browser/supervised_user/supervised_user_content_provider_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/preferences/pref_service_bridge.cc

diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc

index 552afc5ae2907145bd4c5642e0b7459332b86ebf..df1c27c22efd31d592eb1b53987e5abd1182a51f 100644

--- a/chrome/browser/android/preferences/pref_service_bridge.cc

+++ b/chrome/browser/android/preferences/pref_service_bridge.cc

@@ -954,3 +954,10 @@ std::string PrefServiceBridge::GetAndroidPermissionForContentSetting(

return ConvertJavaStringToUTF8(android_permission);

}

+static void SetSupervisedUserId(JNIEnv* env,

+ const JavaParamRef<jobject>& obj,

+ const JavaParamRef<jstring>& pref) {

+ GetPrefService()->SetString(prefs::kSupervisedUserId,

+ ConvertJavaStringToUTF8(env, pref));