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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 18121007: *WIP* Store NSS slots per profile. Move keygen to chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 1108 matching lines...) Expand 10 before | Expand all | Expand 10 after
1119 'browser/net/dns_probe_service.h', 1119 'browser/net/dns_probe_service.h',
1120 'browser/net/evicted_domain_cookie_counter.cc', 1120 'browser/net/evicted_domain_cookie_counter.cc',
1121 'browser/net/evicted_domain_cookie_counter.h', 1121 'browser/net/evicted_domain_cookie_counter.h',
1122 'browser/net/gaia/gaia_oauth_consumer.h', 1122 'browser/net/gaia/gaia_oauth_consumer.h',
1123 'browser/net/gaia/gaia_oauth_fetcher.cc', 1123 'browser/net/gaia/gaia_oauth_fetcher.cc',
1124 'browser/net/gaia/gaia_oauth_fetcher.h', 1124 'browser/net/gaia/gaia_oauth_fetcher.h',
1125 'browser/net/http_pipelining_compatibility_client.cc', 1125 'browser/net/http_pipelining_compatibility_client.cc',
1126 'browser/net/http_pipelining_compatibility_client.h', 1126 'browser/net/http_pipelining_compatibility_client.h',
1127 'browser/net/http_server_properties_manager.h', 1127 'browser/net/http_server_properties_manager.h',
1128 'browser/net/http_server_properties_manager.cc', 1128 'browser/net/http_server_properties_manager.cc',
1129 'browser/net/keygen_handler.h',
1130 'browser/net/keygen_handler_generic.cc',
1131 'browser/net/keygen_handler_nss.cc',
1129 'browser/net/load_time_stats.cc', 1132 'browser/net/load_time_stats.cc',
1130 'browser/net/load_time_stats.h', 1133 'browser/net/load_time_stats.h',
1131 'browser/net/net_error_tab_helper.cc', 1134 'browser/net/net_error_tab_helper.cc',
1132 'browser/net/net_error_tab_helper.h', 1135 'browser/net/net_error_tab_helper.h',
1133 'browser/net/net_log_temp_file.cc', 1136 'browser/net/net_log_temp_file.cc',
1134 'browser/net/net_log_temp_file.h', 1137 'browser/net/net_log_temp_file.h',
1135 'browser/net/net_pref_observer.cc', 1138 'browser/net/net_pref_observer.cc',
1136 'browser/net/net_pref_observer.h', 1139 'browser/net/net_pref_observer.h',
1137 'browser/net/network_stats.cc', 1140 'browser/net/network_stats.cc',
1138 'browser/net/network_stats.h', 1141 'browser/net/network_stats.h',
1139 'browser/net/network_time_tracker.cc', 1142 'browser/net/network_time_tracker.cc',
1140 'browser/net/network_time_tracker.h', 1143 'browser/net/network_time_tracker.h',
1144 'browser/net/nss_slot_factory.cc',
1145 'browser/net/nss_slot_factory.h',
1141 'browser/net/preconnect.cc', 1146 'browser/net/preconnect.cc',
1142 'browser/net/preconnect.h', 1147 'browser/net/preconnect.h',
1143 'browser/net/predictor.cc', 1148 'browser/net/predictor.cc',
1144 'browser/net/predictor.h', 1149 'browser/net/predictor.h',
1145 'browser/net/pref_proxy_config_tracker.h', 1150 'browser/net/pref_proxy_config_tracker.h',
1146 'browser/net/pref_proxy_config_tracker_impl.cc', 1151 'browser/net/pref_proxy_config_tracker_impl.cc',
1147 'browser/net/pref_proxy_config_tracker_impl.h', 1152 'browser/net/pref_proxy_config_tracker_impl.h',
1148 'browser/net/proxy_service_factory.cc', 1153 'browser/net/proxy_service_factory.cc',
1149 'browser/net/proxy_service_factory.h', 1154 'browser/net/proxy_service_factory.h',
1150 'browser/net/referrer.cc', 1155 'browser/net/referrer.cc',
(...skipping 1630 matching lines...) Expand 10 before | Expand all | Expand 10 after
2781 }], 2786 }],
2782 ['use_nss==1', { 2787 ['use_nss==1', {
2783 'sources': [ 2788 'sources': [
2784 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp', 2789 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
2785 'third_party/mozilla_security_manager/nsNSSCertHelper.h', 2790 'third_party/mozilla_security_manager/nsNSSCertHelper.h',
2786 'third_party/mozilla_security_manager/nsNSSCertificate.cpp', 2791 'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
2787 'third_party/mozilla_security_manager/nsNSSCertificate.h', 2792 'third_party/mozilla_security_manager/nsNSSCertificate.h',
2788 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp', 2793 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
2789 'third_party/mozilla_security_manager/nsUsageArrayHelper.h', 2794 'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
2790 ], 2795 ],
2796 'sources!': [
2797 'browser/net/keygen_handler_generic.cc',
2798 ],
2791 }, { # use_nss==0 2799 }, { # use_nss==0
2792 'sources!': [ 2800 'sources!': [
2793 'browser/certificate_manager_model.cc', 2801 'browser/certificate_manager_model.cc',
2794 'browser/certificate_manager_model.h', 2802 'browser/certificate_manager_model.h',
2803 'browser/net/keygen_handler_nss.cc',
2804 'browser/net/nss_slot_factory.cc',
2805 'browser/net/nss_slot_factory.h',
2795 ], 2806 ],
2796 }], 2807 }],
2797 ['toolkit_uses_gtk == 1', { 2808 ['toolkit_uses_gtk == 1', {
2798 'dependencies': [ 2809 'dependencies': [
2799 '../build/linux/system.gyp:dbus', 2810 '../build/linux/system.gyp:dbus',
2800 '../build/linux/system.gyp:gconf', 2811 '../build/linux/system.gyp:gconf',
2801 '../build/linux/system.gyp:gtk', 2812 '../build/linux/system.gyp:gtk',
2802 '../build/linux/system.gyp:gtkprint', 2813 '../build/linux/system.gyp:gtkprint',
2803 '../build/linux/system.gyp:ssl', 2814 '../build/linux/system.gyp:ssl',
2804 '../build/linux/system.gyp:x11', 2815 '../build/linux/system.gyp:x11',
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
3344 'package_name': 'org/chromium/chrome/browser/ui/toolbar', 3355 'package_name': 'org/chromium/chrome/browser/ui/toolbar',
3345 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'], 3356 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'],
3346 }, 3357 },
3347 'includes': [ '../build/android/java_cpp_template.gypi' ], 3358 'includes': [ '../build/android/java_cpp_template.gypi' ],
3348 }, 3359 },
3349 ], 3360 ],
3350 }, 3361 },
3351 ], 3362 ],
3352 ], 3363 ],
3353 } 3364 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698