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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser.gypi

Issue 9940001: Fix imported server certs being distrusted in NSS 3.13. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanups Created 8 years, 7 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
« chrome/browser/chromeos/cros/onc_network_parser_unittest.cc ('K') | « chrome/browser/ui/webui/options2/certificate_manager_handler2.cc ('k') | chrome/common/net/x509_certificate_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6759428af194f0c097806ccf1b85c4b140680975..00eb8994e6a048328a0b90ef5a3a36f8871cf0f4 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4491,17 +4491,20 @@
'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
],
- }],
- ['use_nss==0 and use_openssl==0', {
+ }, { # use_nss==0
'sources!': [
'browser/certificate_manager_model.cc',
'browser/certificate_manager_model.h',
+ 'browser/ui/webui/options2/certificate_manager_handler2.cc',
+ 'browser/ui/webui/options2/certificate_manager_handler2.h',
+ ],
+ }],
+ ['use_nss==0 and use_openssl==0', {
+ 'sources!': [
'browser/ui/webui/certificate_viewer_webui.cc',
'browser/ui/webui/certificate_viewer_webui.h',
'browser/ui/webui/certificate_viewer_ui.cc',
'browser/ui/webui/certificate_viewer_ui.h',
- 'browser/ui/webui/options2/certificate_manager_handler2.cc',
- 'browser/ui/webui/options2/certificate_manager_handler2.h',
],
}],
['toolkit_uses_gtk == 1', {
« chrome/browser/chromeos/cros/onc_network_parser_unittest.cc ('K') | « chrome/browser/ui/webui/options2/certificate_manager_handler2.cc ('k') | chrome/common/net/x509_certificate_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698