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

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: cleanups, add test for chrome keygen class 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 1167 matching lines...) Expand 10 before | Expand all | Expand 10 after
1178 'browser/net/evicted_domain_cookie_counter.h', 1178 'browser/net/evicted_domain_cookie_counter.h',
1179 'browser/net/firefox_proxy_settings.cc', 1179 'browser/net/firefox_proxy_settings.cc',
1180 'browser/net/firefox_proxy_settings.h', 1180 'browser/net/firefox_proxy_settings.h',
1181 'browser/net/gaia/gaia_oauth_consumer.h', 1181 'browser/net/gaia/gaia_oauth_consumer.h',
1182 'browser/net/gaia/gaia_oauth_fetcher.cc', 1182 'browser/net/gaia/gaia_oauth_fetcher.cc',
1183 'browser/net/gaia/gaia_oauth_fetcher.h', 1183 'browser/net/gaia/gaia_oauth_fetcher.h',
1184 'browser/net/http_pipelining_compatibility_client.cc', 1184 'browser/net/http_pipelining_compatibility_client.cc',
1185 'browser/net/http_pipelining_compatibility_client.h', 1185 'browser/net/http_pipelining_compatibility_client.h',
1186 'browser/net/http_server_properties_manager.cc', 1186 'browser/net/http_server_properties_manager.cc',
1187 'browser/net/http_server_properties_manager.h', 1187 'browser/net/http_server_properties_manager.h',
1188 'browser/net/keygen_handler.h',
1189 'browser/net/keygen_handler_generic.cc',
1190 'browser/net/keygen_handler_nss.cc',
1188 'browser/net/load_time_stats.cc', 1191 'browser/net/load_time_stats.cc',
1189 'browser/net/load_time_stats.h', 1192 'browser/net/load_time_stats.h',
1190 'browser/net/net_error_tab_helper.cc', 1193 'browser/net/net_error_tab_helper.cc',
1191 'browser/net/net_error_tab_helper.h', 1194 'browser/net/net_error_tab_helper.h',
1192 'browser/net/net_log_temp_file.cc', 1195 'browser/net/net_log_temp_file.cc',
1193 'browser/net/net_log_temp_file.h', 1196 'browser/net/net_log_temp_file.h',
1194 'browser/net/net_pref_observer.cc', 1197 'browser/net/net_pref_observer.cc',
1195 'browser/net/net_pref_observer.h', 1198 'browser/net/net_pref_observer.h',
1196 'browser/net/network_stats.cc', 1199 'browser/net/network_stats.cc',
1197 'browser/net/network_stats.h', 1200 'browser/net/network_stats.h',
1198 'browser/net/network_time_tracker.cc', 1201 'browser/net/network_time_tracker.cc',
1199 'browser/net/network_time_tracker.h', 1202 'browser/net/network_time_tracker.h',
1203 'browser/net/nss_slot_factory.cc',
1204 'browser/net/nss_slot_factory.h',
1200 'browser/net/preconnect.cc', 1205 'browser/net/preconnect.cc',
1201 'browser/net/preconnect.h', 1206 'browser/net/preconnect.h',
1202 'browser/net/predictor.cc', 1207 'browser/net/predictor.cc',
1203 'browser/net/predictor.h', 1208 'browser/net/predictor.h',
1204 'browser/net/predictor_tab_helper.cc', 1209 'browser/net/predictor_tab_helper.cc',
1205 'browser/net/predictor_tab_helper.h', 1210 'browser/net/predictor_tab_helper.h',
1206 'browser/net/pref_proxy_config_tracker.cc', 1211 'browser/net/pref_proxy_config_tracker.cc',
1207 'browser/net/pref_proxy_config_tracker.h', 1212 'browser/net/pref_proxy_config_tracker.h',
1208 'browser/net/pref_proxy_config_tracker_impl.cc', 1213 'browser/net/pref_proxy_config_tracker_impl.cc',
1209 'browser/net/pref_proxy_config_tracker_impl.h', 1214 'browser/net/pref_proxy_config_tracker_impl.h',
(...skipping 1731 matching lines...) Expand 10 before | Expand all | Expand 10 after
2941 }], 2946 }],
2942 ['use_nss==1', { 2947 ['use_nss==1', {
2943 'sources': [ 2948 'sources': [
2944 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp', 2949 'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
2945 'third_party/mozilla_security_manager/nsNSSCertHelper.h', 2950 'third_party/mozilla_security_manager/nsNSSCertHelper.h',
2946 'third_party/mozilla_security_manager/nsNSSCertificate.cpp', 2951 'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
2947 'third_party/mozilla_security_manager/nsNSSCertificate.h', 2952 'third_party/mozilla_security_manager/nsNSSCertificate.h',
2948 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp', 2953 'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
2949 'third_party/mozilla_security_manager/nsUsageArrayHelper.h', 2954 'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
2950 ], 2955 ],
2956 'sources!': [
2957 'browser/net/keygen_handler_generic.cc',
2958 ],
2951 }, { # use_nss==0 2959 }, { # use_nss==0
2952 'sources!': [ 2960 'sources!': [
2953 'browser/certificate_manager_model.cc', 2961 'browser/certificate_manager_model.cc',
2954 'browser/certificate_manager_model.h', 2962 'browser/certificate_manager_model.h',
2963 'browser/net/keygen_handler_nss.cc',
2964 'browser/net/nss_slot_factory.cc',
2965 'browser/net/nss_slot_factory.h',
2955 ], 2966 ],
2956 }], 2967 }],
2957 ['toolkit_uses_gtk == 1', { 2968 ['toolkit_uses_gtk == 1', {
2958 'dependencies': [ 2969 'dependencies': [
2959 '../build/linux/system.gyp:dbus', 2970 '../build/linux/system.gyp:dbus',
2960 '../build/linux/system.gyp:gconf', 2971 '../build/linux/system.gyp:gconf',
2961 '../build/linux/system.gyp:gtk', 2972 '../build/linux/system.gyp:gtk',
2962 '../build/linux/system.gyp:gtkprint', 2973 '../build/linux/system.gyp:gtkprint',
2963 '../build/linux/system.gyp:ssl', 2974 '../build/linux/system.gyp:ssl',
2964 '../build/linux/system.gyp:x11', 2975 '../build/linux/system.gyp:x11',
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
3585 'package_name': 'org/chromium/chrome/browser/ui/toolbar', 3596 'package_name': 'org/chromium/chrome/browser/ui/toolbar',
3586 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'], 3597 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'],
3587 }, 3598 },
3588 'includes': [ '../build/android/java_cpp_template.gypi' ], 3599 'includes': [ '../build/android/java_cpp_template.gypi' ],
3589 }, 3600 },
3590 ], 3601 ],
3591 }, 3602 },
3592 ], 3603 ],
3593 ], 3604 ],
3594 } 3605 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698