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

Unified 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, 6 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 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 381db83b13759f9a38f8e70de2564e0cdaaec01b..f54b6429147271ab0e943bc836b1e483ed9d4212 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1126,6 +1126,9 @@
'browser/net/http_pipelining_compatibility_client.h',
'browser/net/http_server_properties_manager.h',
'browser/net/http_server_properties_manager.cc',
+ 'browser/net/keygen_handler.h',
+ 'browser/net/keygen_handler_generic.cc',
+ 'browser/net/keygen_handler_nss.cc',
'browser/net/load_time_stats.cc',
'browser/net/load_time_stats.h',
'browser/net/net_error_tab_helper.cc',
@@ -1138,6 +1141,8 @@
'browser/net/network_stats.h',
'browser/net/network_time_tracker.cc',
'browser/net/network_time_tracker.h',
+ 'browser/net/nss_slot_factory.cc',
+ 'browser/net/nss_slot_factory.h',
'browser/net/preconnect.cc',
'browser/net/preconnect.h',
'browser/net/predictor.cc',
@@ -2788,10 +2793,16 @@
'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
],
+ 'sources!': [
+ 'browser/net/keygen_handler_generic.cc',
+ ],
}, { # use_nss==0
'sources!': [
'browser/certificate_manager_model.cc',
'browser/certificate_manager_model.h',
+ 'browser/net/keygen_handler_nss.cc',
+ 'browser/net/nss_slot_factory.cc',
+ 'browser/net/nss_slot_factory.h',
],
}],
['toolkit_uses_gtk == 1', {

Powered by Google App Engine
This is Rietveld 408576698