Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(663)

Unified Diff: chrome/chrome_browser.gypi

Issue 789853002: Add support for child accounts on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sync Created 6 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
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index bf35e4c369e3a093d29cc475eddb9490fcf45e21..cfa870ceea59343aeb626f2bfbeedf8bfb51b4ed 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -678,6 +678,8 @@
'browser/media/protected_media_identifier_permission_context_factory.h',
'browser/password_manager/generated_password_saved_infobar_delegate_android.cc',
'browser/password_manager/generated_password_saved_infobar_delegate_android.h',
+ 'browser/supervised_user/child_accounts/child_account_service_android.cc',
Marc Treib 2014/12/10 11:53:27 Should these go into an "android && enable_supervi
Bernhard Bauer 2014/12/11 09:07:58 Hm... Now that you mention it and looking at other
Marc Treib 2014/12/11 12:21:31 Ah.. a bit magic, but convenient.
+ 'browser/supervised_user/child_accounts/child_account_service_android.h',
],
# Cross-platform Ash sources.
'chrome_browser_ash_sources': [
@@ -1575,6 +1577,7 @@
'android/java/src/org/chromium/chrome/browser/BookmarksBridge.java',
'android/java/src/org/chromium/chrome/browser/banners/AppBannerManager.java',
'android/java/src/org/chromium/chrome/browser/CertificateViewer.java',
+ 'android/java/src/org/chromium/chrome/browser/child_accounts/ChildAccountService.java',
'android/java/src/org/chromium/chrome/browser/ChromiumApplication.java',
'android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java',
'android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java',

Powered by Google App Engine
This is Rietveld 408576698