chrome/chrome_browser.gypi - 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/chrome_browser.gypi

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

Index: chrome/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index 28d3d882f65e2fb585e3ad18c0ca389e70e9cee7..8e00aef31f15671dfcda672ec70195bc8b102f6e 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -1897,6 +1897,7 @@

'android/java/src/org/chromium/chrome/browser/signin/SigninManager.java',

'android/java/src/org/chromium/chrome/browser/snackbar/smartlockautosignin/AutoSigninSnackbarController.java',

'android/java/src/org/chromium/chrome/browser/spellchecker/SpellCheckerSessionBridge.java',

+ 'android/java/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProvider.java',

'android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java',

'android/java/src/org/chromium/chrome/browser/tab/Tab.java',

'android/java/src/org/chromium/chrome/browser/tab/TabWebContentsDelegateAndroid.java',

@@ -2862,6 +2863,8 @@

'browser/supervised_user/supervised_user_bookmarks_handler.h',

'browser/supervised_user/supervised_user_constants.cc',

'browser/supervised_user/supervised_user_constants.h',

+ 'browser/supervised_user/supervised_user_content_provider_android.cc',

+ 'browser/supervised_user/supervised_user_content_provider_android.h',

'browser/supervised_user/supervised_user_interstitial.cc',

'browser/supervised_user/supervised_user_interstitial.h',

'browser/supervised_user/supervised_user_navigation_observer.cc',

« no previous file with comments | « chrome/chrome.gyp ('k') | components/components.gyp » ('j') | no next file with comments »