chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java - 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/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java

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/java/DEPS ('k') | chrome/android/java/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProvider.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java

index 40df78393c3ef9b671dfb7bf001cccb58f1d663b..1d6755ae4df9e52b7db87639dc33b8828e970c8e 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java

@@ -10,7 +10,6 @@

import android.util.Log;

import org.chromium.base.ThreadUtils;

-import org.chromium.base.VisibleForTesting;

import org.chromium.base.annotations.CalledByNative;

import org.chromium.chrome.browser.ContentSettingsType;

import org.chromium.chrome.browser.preferences.website.ContentSetting;

@@ -922,11 +921,6 @@

public boolean getClickedUpdateMenuItem() {

return nativeGetClickedUpdateMenuItem();

- }

- @VisibleForTesting

- public void setSupervisedUserId(String supervisedUserId) {

- nativeSetSupervisedUserId(supervisedUserId);

}

private native boolean nativeGetAcceptCookiesEnabled();

@@ -1023,5 +1017,4 @@

private native boolean nativeHasSetMetricsReporting();

private native void nativeSetClickedUpdateMenuItem(boolean clicked);

private native boolean nativeGetClickedUpdateMenuItem();

- private native void nativeSetSupervisedUserId(String supervisedUserId);

}