Index: chrome/chrome_browser.gypi |
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi |
index e77f471c192dbaadf7684fa0c906efb0e0c85a5b..29d08d72a3ffae9ec48ab9616d76023755d8f74e 100644 |
--- a/chrome/chrome_browser.gypi |
+++ b/chrome/chrome_browser.gypi |
@@ -1019,61 +1019,6 @@ |
'browser/mac/relauncher.h', |
'browser/mac/security_wrappers.cc', |
'browser/mac/security_wrappers.h', |
- 'browser/managed_mode/custodian_profile_downloader_service.cc', |
- 'browser/managed_mode/custodian_profile_downloader_service.h', |
- 'browser/managed_mode/custodian_profile_downloader_service_factory.cc', |
- 'browser/managed_mode/custodian_profile_downloader_service_factory.h', |
- 'browser/managed_mode/managed_mode_interstitial.cc', |
- 'browser/managed_mode/managed_mode_interstitial.h', |
- 'browser/managed_mode/managed_mode_navigation_observer.cc', |
- 'browser/managed_mode/managed_mode_navigation_observer.h', |
- 'browser/managed_mode/managed_mode_resource_throttle.cc', |
- 'browser/managed_mode/managed_mode_resource_throttle.h', |
- 'browser/managed_mode/managed_mode_site_list.cc', |
- 'browser/managed_mode/managed_mode_site_list.h', |
- 'browser/managed_mode/managed_mode_url_filter.cc', |
- 'browser/managed_mode/managed_mode_url_filter.h', |
- 'browser/managed_mode/managed_user_constants.cc', |
- 'browser/managed_mode/managed_user_constants.h', |
- 'browser/managed_mode/managed_user_refresh_token_fetcher.cc', |
- 'browser/managed_mode/managed_user_refresh_token_fetcher.h', |
- 'browser/managed_mode/managed_user_registration_utility.cc', |
- 'browser/managed_mode/managed_user_registration_utility.h', |
- 'browser/managed_mode/managed_user_registration_utility_stub.cc', |
- 'browser/managed_mode/managed_user_registration_utility_stub.h', |
- 'browser/managed_mode/managed_user_settings_service.cc', |
- 'browser/managed_mode/managed_user_settings_service.h', |
- 'browser/managed_mode/managed_user_settings_service_factory.cc', |
- 'browser/managed_mode/managed_user_settings_service_factory.h', |
- 'browser/managed_mode/managed_user_service.cc', |
- 'browser/managed_mode/managed_user_service.h', |
- 'browser/managed_mode/managed_user_service_factory.cc', |
- 'browser/managed_mode/managed_user_service_factory.h', |
- 'browser/managed_mode/managed_user_shared_settings_service.cc', |
- 'browser/managed_mode/managed_user_shared_settings_service.h', |
- 'browser/managed_mode/managed_user_shared_settings_service_factory.cc', |
- 'browser/managed_mode/managed_user_shared_settings_service_factory.h', |
- 'browser/managed_mode/managed_user_shared_settings_update.cc', |
- 'browser/managed_mode/managed_user_shared_settings_update.h', |
- 'browser/managed_mode/managed_user_sync_service.cc', |
- 'browser/managed_mode/managed_user_sync_service.h', |
- 'browser/managed_mode/managed_user_sync_service_factory.cc', |
- 'browser/managed_mode/managed_user_sync_service_factory.h', |
- 'browser/managed_mode/managed_user_sync_service_observer.h', |
- 'browser/managed_mode/managed_user_theme.cc', |
- 'browser/managed_mode/managed_user_theme.h', |
- 'browser/managed_mode/managed_users.h', |
- 'browser/managed_mode/permission_request_creator.h', |
- 'browser/managed_mode/permission_request_creator_apiary.cc', |
- 'browser/managed_mode/permission_request_creator_apiary.h', |
- 'browser/managed_mode/permission_request_creator_sync.cc', |
- 'browser/managed_mode/permission_request_creator_sync.h', |
- 'browser/managed_mode/supervised_user_pref_mapping_service.cc', |
- 'browser/managed_mode/supervised_user_pref_mapping_service.h', |
- 'browser/managed_mode/supervised_user_pref_mapping_service_factory.cc', |
- 'browser/managed_mode/supervised_user_pref_mapping_service_factory.h', |
- 'browser/managed_mode/supervised_user_pref_store.cc', |
- 'browser/managed_mode/supervised_user_pref_store.h', |
'browser/media/audio_stream_monitor.cc', |
'browser/media/audio_stream_monitor.h', |
'browser/media/cast_transport_host_filter.cc', |
@@ -2190,6 +2135,61 @@ |
'browser/status_icons/status_icon_observer.h', |
'browser/status_icons/status_tray.cc', |
'browser/status_icons/status_tray.h', |
+ 'browser/supervised_user/custodian_profile_downloader_service.cc', |
+ 'browser/supervised_user/custodian_profile_downloader_service.h', |
+ 'browser/supervised_user/custodian_profile_downloader_service_factory.cc', |
+ 'browser/supervised_user/custodian_profile_downloader_service_factory.h', |
+ 'browser/supervised_user/permission_request_creator.h', |
+ 'browser/supervised_user/permission_request_creator_apiary.cc', |
+ 'browser/supervised_user/permission_request_creator_apiary.h', |
+ 'browser/supervised_user/permission_request_creator_sync.cc', |
+ 'browser/supervised_user/permission_request_creator_sync.h', |
+ 'browser/supervised_user/supervised_user_constants.cc', |
+ 'browser/supervised_user/supervised_user_constants.h', |
+ 'browser/supervised_user/supervised_user_interstitial.cc', |
+ 'browser/supervised_user/supervised_user_interstitial.h', |
+ 'browser/supervised_user/supervised_user_navigation_observer.cc', |
+ 'browser/supervised_user/supervised_user_navigation_observer.h', |
+ 'browser/supervised_user/supervised_user_pref_mapping_service.cc', |
+ 'browser/supervised_user/supervised_user_pref_mapping_service.h', |
+ 'browser/supervised_user/supervised_user_pref_mapping_service_factory.cc', |
+ 'browser/supervised_user/supervised_user_pref_mapping_service_factory.h', |
+ 'browser/supervised_user/supervised_user_pref_store.cc', |
+ 'browser/supervised_user/supervised_user_pref_store.h', |
+ 'browser/supervised_user/supervised_user_refresh_token_fetcher.cc', |
+ 'browser/supervised_user/supervised_user_refresh_token_fetcher.h', |
+ 'browser/supervised_user/supervised_user_registration_utility.cc', |
+ 'browser/supervised_user/supervised_user_registration_utility.h', |
+ 'browser/supervised_user/supervised_user_registration_utility_stub.cc', |
+ 'browser/supervised_user/supervised_user_registration_utility_stub.h', |
+ 'browser/supervised_user/supervised_user_resource_throttle.cc', |
+ 'browser/supervised_user/supervised_user_resource_throttle.h', |
+ 'browser/supervised_user/supervised_user_service.cc', |
+ 'browser/supervised_user/supervised_user_service.h', |
+ 'browser/supervised_user/supervised_user_service_factory.cc', |
+ 'browser/supervised_user/supervised_user_service_factory.h', |
+ 'browser/supervised_user/supervised_user_settings_service.cc', |
+ 'browser/supervised_user/supervised_user_settings_service.h', |
+ 'browser/supervised_user/supervised_user_settings_service_factory.cc', |
+ 'browser/supervised_user/supervised_user_settings_service_factory.h', |
+ 'browser/supervised_user/supervised_user_shared_settings_service.cc', |
+ 'browser/supervised_user/supervised_user_shared_settings_service.h', |
+ 'browser/supervised_user/supervised_user_shared_settings_service_factory.cc', |
+ 'browser/supervised_user/supervised_user_shared_settings_service_factory.h', |
+ 'browser/supervised_user/supervised_user_shared_settings_update.cc', |
+ 'browser/supervised_user/supervised_user_shared_settings_update.h', |
+ 'browser/supervised_user/supervised_user_site_list.cc', |
+ 'browser/supervised_user/supervised_user_site_list.h', |
+ 'browser/supervised_user/supervised_user_sync_service.cc', |
+ 'browser/supervised_user/supervised_user_sync_service.h', |
+ 'browser/supervised_user/supervised_user_sync_service_factory.cc', |
+ 'browser/supervised_user/supervised_user_sync_service_factory.h', |
+ 'browser/supervised_user/supervised_user_sync_service_observer.h', |
+ 'browser/supervised_user/supervised_user_theme.cc', |
+ 'browser/supervised_user/supervised_user_theme.h', |
+ 'browser/supervised_user/supervised_user_url_filter.cc', |
+ 'browser/supervised_user/supervised_user_url_filter.h', |
+ 'browser/supervised_user/supervised_users.h', |
'browser/sxs_linux.cc', |
'browser/sxs_linux.h', |
'browser/sync/about_sync_util.cc', |
@@ -3465,7 +3465,7 @@ |
}], |
['enable_managed_users!=1', { |
'sources/': [ |
- ['exclude', '^browser/managed_mode/'], |
+ ['exclude', '^browser/supervised_user/'], |
], |
}], |
['enable_webrtc==0', { |