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

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: review fixes 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') | chrome/browser/ui/webui/options2/certificate_manager2_browsertest.js » ('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 1e310d2a682b6d3e0c3e08849e31bf5e1ef3fdb8..f3c12784070414864070d4b6e4fa829ada0e17e4 100644
--- a/chrome/browser/resources/options2/options.html
+++ b/chrome/browser/resources/options2/options.html
@@ -47,7 +47,7 @@
<if expr="pp_ifdef('chromeos') and pp_ifdef('use_virtual_keyboard')">
<link rel="stylesheet" href="chromeos/virtual_keyboard.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>
@@ -105,7 +105,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') | chrome/browser/ui/webui/options2/certificate_manager2_browsertest.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698