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

Side by Side Diff: trunk/src/chrome/chrome_browser.gypi

Issue 23477040: Revert 221410 "Add ManagedUserSettingsService and a SupervisedUs..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 948 matching lines...) Expand 10 before | Expand all | Expand 10 after
959 'browser/managed_mode/managed_mode_interstitial.cc', 959 'browser/managed_mode/managed_mode_interstitial.cc',
960 'browser/managed_mode/managed_mode_interstitial.h', 960 'browser/managed_mode/managed_mode_interstitial.h',
961 'browser/managed_mode/managed_mode_navigation_observer.cc', 961 'browser/managed_mode/managed_mode_navigation_observer.cc',
962 'browser/managed_mode/managed_mode_navigation_observer.h', 962 'browser/managed_mode/managed_mode_navigation_observer.h',
963 'browser/managed_mode/managed_mode_resource_throttle.cc', 963 'browser/managed_mode/managed_mode_resource_throttle.cc',
964 'browser/managed_mode/managed_mode_resource_throttle.h', 964 'browser/managed_mode/managed_mode_resource_throttle.h',
965 'browser/managed_mode/managed_mode_site_list.cc', 965 'browser/managed_mode/managed_mode_site_list.cc',
966 'browser/managed_mode/managed_mode_site_list.h', 966 'browser/managed_mode/managed_mode_site_list.h',
967 'browser/managed_mode/managed_mode_url_filter.cc', 967 'browser/managed_mode/managed_mode_url_filter.cc',
968 'browser/managed_mode/managed_mode_url_filter.h', 968 'browser/managed_mode/managed_mode_url_filter.h',
969 'browser/managed_mode/managed_user_constants.cc',
970 'browser/managed_mode/managed_user_constants.h',
971 'browser/managed_mode/managed_user_refresh_token_fetcher.cc', 969 'browser/managed_mode/managed_user_refresh_token_fetcher.cc',
972 'browser/managed_mode/managed_user_refresh_token_fetcher.h', 970 'browser/managed_mode/managed_user_refresh_token_fetcher.h',
973 'browser/managed_mode/managed_user_registration_utility.cc', 971 'browser/managed_mode/managed_user_registration_utility.cc',
974 'browser/managed_mode/managed_user_registration_utility.h', 972 'browser/managed_mode/managed_user_registration_utility.h',
975 'browser/managed_mode/managed_user_registration_utility_stub.cc', 973 'browser/managed_mode/managed_user_registration_utility_stub.cc',
976 'browser/managed_mode/managed_user_registration_utility_stub.h', 974 'browser/managed_mode/managed_user_registration_utility_stub.h',
977 'browser/managed_mode/managed_user_settings_service.cc',
978 'browser/managed_mode/managed_user_settings_service.h',
979 'browser/managed_mode/managed_user_settings_service_factory.cc',
980 'browser/managed_mode/managed_user_settings_service_factory.h',
981 'browser/managed_mode/managed_user_service.cc', 975 'browser/managed_mode/managed_user_service.cc',
982 'browser/managed_mode/managed_user_service.h', 976 'browser/managed_mode/managed_user_service.h',
983 'browser/managed_mode/managed_user_service_factory.cc', 977 'browser/managed_mode/managed_user_service_factory.cc',
984 'browser/managed_mode/managed_user_service_factory.h', 978 'browser/managed_mode/managed_user_service_factory.h',
985 'browser/managed_mode/managed_user_sync_service.cc', 979 'browser/managed_mode/managed_user_sync_service.cc',
986 'browser/managed_mode/managed_user_sync_service.h', 980 'browser/managed_mode/managed_user_sync_service.h',
987 'browser/managed_mode/managed_user_sync_service_factory.cc', 981 'browser/managed_mode/managed_user_sync_service_factory.cc',
988 'browser/managed_mode/managed_user_sync_service_factory.h', 982 'browser/managed_mode/managed_user_sync_service_factory.h',
989 'browser/managed_mode/managed_user_sync_service_observer.h', 983 'browser/managed_mode/managed_user_sync_service_observer.h',
990 'browser/managed_mode/managed_user_theme.cc', 984 'browser/managed_mode/managed_user_theme.cc',
991 'browser/managed_mode/managed_user_theme.h', 985 'browser/managed_mode/managed_user_theme.h',
992 'browser/managed_mode/managed_users.h', 986 'browser/managed_mode/managed_users.h',
993 'browser/managed_mode/supervised_user_pref_store.cc',
994 'browser/managed_mode/supervised_user_pref_store.h',
995 'browser/media/audio_stream_indicator.cc', 987 'browser/media/audio_stream_indicator.cc',
996 'browser/media/audio_stream_indicator.h', 988 'browser/media/audio_stream_indicator.h',
997 'browser/media/chrome_midi_permission_context.cc', 989 'browser/media/chrome_midi_permission_context.cc',
998 'browser/media/chrome_midi_permission_context.h', 990 'browser/media/chrome_midi_permission_context.h',
999 'browser/media/chrome_midi_permission_context_factory.cc', 991 'browser/media/chrome_midi_permission_context_factory.cc',
1000 'browser/media/chrome_midi_permission_context_factory.h', 992 'browser/media/chrome_midi_permission_context_factory.h',
1001 'browser/media/desktop_streams_registry.cc', 993 'browser/media/desktop_streams_registry.cc',
1002 'browser/media/desktop_streams_registry.h', 994 'browser/media/desktop_streams_registry.h',
1003 'browser/media/desktop_media_picker.h', 995 'browser/media/desktop_media_picker.h',
1004 'browser/media/desktop_media_picker_model.cc', 996 'browser/media/desktop_media_picker_model.cc',
(...skipping 2326 matching lines...) Expand 10 before | Expand all | Expand 10 after
3331 ], 3323 ],
3332 }], 3324 }],
3333 ['enable_app_list==1', { 3325 ['enable_app_list==1', {
3334 'dependencies': [ 3326 'dependencies': [
3335 '../ui/app_list/app_list.gyp:app_list', 3327 '../ui/app_list/app_list.gyp:app_list',
3336 ] 3328 ]
3337 }], 3329 }],
3338 ['enable_managed_users!=1', { 3330 ['enable_managed_users!=1', {
3339 'sources/': [ 3331 'sources/': [
3340 ['exclude', '^browser/managed_mode/'], 3332 ['exclude', '^browser/managed_mode/'],
3341 ], 3333 ]
3342 }], 3334 }],
3343 ['enable_webrtc==0', { 3335 ['enable_webrtc==0', {
3344 'sources!': [ 3336 'sources!': [
3345 'browser/media/webrtc_log_upload_list.cc', 3337 'browser/media/webrtc_log_upload_list.cc',
3346 'browser/media/webrtc_log_upload_list.h', 3338 'browser/media/webrtc_log_upload_list.h',
3347 'browser/media/webrtc_log_uploader.cc', 3339 'browser/media/webrtc_log_uploader.cc',
3348 'browser/media/webrtc_log_uploader.h', 3340 'browser/media/webrtc_log_uploader.h',
3349 'browser/media/webrtc_logging_handler_host.cc', 3341 'browser/media/webrtc_logging_handler_host.cc',
3350 'browser/media/webrtc_logging_handler_host.h', 3342 'browser/media/webrtc_logging_handler_host.h',
3351 ] 3343 ]
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
3566 'package_name': 'org/chromium/chrome/browser/ui/toolbar', 3558 'package_name': 'org/chromium/chrome/browser/ui/toolbar',
3567 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'], 3559 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'],
3568 }, 3560 },
3569 'includes': [ '../build/android/java_cpp_template.gypi' ], 3561 'includes': [ '../build/android/java_cpp_template.gypi' ],
3570 }, 3562 },
3571 ], 3563 ],
3572 }, 3564 },
3573 ], 3565 ],
3574 ], 3566 ],
3575 } 3567 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/managed_mode/supervised_user_pref_store_unittest.cc ('k') | trunk/src/chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698