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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/options2/options.html

Issue 9940001: Fix imported server certs being distrusted in NSS 3.13. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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.cc ('K') | « chrome/browser/resources/options2/browser_options.html ('k') | chrome/browser/resources/options2/options_bundle.js » ('j') | net/base/cert_database_nss_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options2/options.html
diff --git a/chrome/browser/resources/options2/options.html b/chrome/browser/resources/options2/options.html
index 143f56859be97e7c201714a2632550ab2f2d191e..2da38b888ae8b06e002c1a7be4ac8a51a17c7fde 100644
--- a/chrome/browser/resources/options2/options.html
+++ b/chrome/browser/resources/options2/options.html
@@ -44,7 +44,7 @@
<if expr="pp_ifdef('chromeos') and pp_ifdef('use_ash')">
<link rel="stylesheet" href="chromeos/set_wallpaper_options.css">
</if>
-<if expr="not is_win and not is_macosx">
+<if expr="pp_ifdef('use_nss')">
<link rel="stylesheet" href="certificate_manager.css">
<link rel="stylesheet" href="certificate_tree.css">
</if>
@@ -102,7 +102,7 @@
<if expr="pp_ifdef('chromeos') and pp_ifdef('use_ash')">
<include src="chromeos/set_wallpaper_options.html">
</if>
- <if expr="not is_win and not is_macosx">
+ <if expr="pp_ifdef('use_nss')">
<include src="certificate_manager.html">
</if>
</div>
« chrome/browser/chromeos/cros/onc_network_parser.cc ('K') | « chrome/browser/resources/options2/browser_options.html ('k') | chrome/browser/resources/options2/options_bundle.js » ('j') | net/base/cert_database_nss_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698