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

Unified Diff: chrome/browser/resources/options2/options_bundle.js

Issue 10458069: Reland: Fix imported server certs being distrusted in NSS 3.13. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix the test failures 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
Index: chrome/browser/resources/options2/options_bundle.js
diff --git a/chrome/browser/resources/options2/options_bundle.js b/chrome/browser/resources/options2/options_bundle.js
index 819f1f515731720bb4da2a73ef1ad6793d204077..993995e2410dd918c93b7f0a87b3128330d04897 100644
--- a/chrome/browser/resources/options2/options_bundle.js
+++ b/chrome/browser/resources/options2/options_bundle.js
@@ -43,7 +43,7 @@
<include src="chromeos/set_wallpaper_options.js"></include>
var SetWallpaperOptions = options.SetWallpaperOptions;
</if>
-<if expr="not is_win and not is_macosx">
+<if expr="pp_ifdef('use_nss')">
<include src="certificate_tree.js"></include>
<include src="certificate_manager.js"></include>
<include src="certificate_restore_overlay.js"></include>
« no previous file with comments | « chrome/browser/resources/options2/options.html ('k') | chrome/browser/ui/webui/options2/certificate_manager2_browsertest.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698