chrome/browser/android/chrome_jni_registrar.cc - Issue 1539653002: Revert of 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/chrome_jni_registrar.cc

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

Patch Set: Created 5 years 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/junit/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProviderUnitTest.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/browser/android/chrome_jni_registrar.cc

diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc

index 579732a0cc27893bc59202410e84f438f743374b..b24d754a2ddbfcf84ea7d09424827eb6c017924a 100644

--- a/chrome/browser/android/chrome_jni_registrar.cc

+++ b/chrome/browser/android/chrome_jni_registrar.cc

@@ -112,7 +112,6 @@

#include "chrome/browser/ssl/security_state_model_android.h"

#include "chrome/browser/supervised_user/child_accounts/child_account_feedback_reporter_android.h"

#include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h"

-#include "chrome/browser/supervised_user/supervised_user_content_provider_android.h"

#include "chrome/browser/sync/profile_sync_service_android.h"

#include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android.h"

#include "chrome/browser/ui/android/autofill/autofill_dialog_result.h"

@@ -335,7 +334,6 @@

{"SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid},

{"StartupMetricUtils", RegisterStartupMetricUtils},

{"StaticTabSceneLayer", chrome::android::RegisterStaticTabSceneLayer},

- {"SupervisedUserContentProvider", SupervisedUserContentProvider::Register},

{"Sync", syncer::RegisterSyncJni},

{"TabAndroid", TabAndroid::RegisterTabAndroid},

{"TabContentManager", chrome::android::RegisterTabContentManager},