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

Side by Side Diff: chrome/browser/resources/options2/options_bundle.js

Issue 9940001: Fix imported server certs being distrusted in NSS 3.13. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove openssl stubs, replace TrustBits::TRUST_TERMINAL_RECORD with EXPLICIT_DISTRUST 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // This file exists to aggregate all of the javascript used by the 5 // This file exists to aggregate all of the javascript used by the
6 // settings page into a single file which will be flattened and served 6 // settings page into a single file which will be flattened and served
7 // as a single resource. 7 // as a single resource.
8 <include src="controlled_setting.js"></include> 8 <include src="controlled_setting.js"></include>
9 <include src="deletable_item_list.js"></include> 9 <include src="deletable_item_list.js"></include>
10 <include src="inline_editable_list.js"></include> 10 <include src="inline_editable_list.js"></include>
(...skipping 27 matching lines...) Expand all
38 var BluetoothOptions = options.BluetoothOptions; 38 var BluetoothOptions = options.BluetoothOptions;
39 var BluetoothPairing = options.BluetoothPairing; 39 var BluetoothPairing = options.BluetoothPairing;
40 var KeyboardOverlay = options.KeyboardOverlay; 40 var KeyboardOverlay = options.KeyboardOverlay;
41 var PointerOverlay = options.PointerOverlay; 41 var PointerOverlay = options.PointerOverlay;
42 var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks; 42 var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks;
43 </if> 43 </if>
44 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_ash')"> 44 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_ash')">
45 <include src="chromeos/set_wallpaper_options.js"></include> 45 <include src="chromeos/set_wallpaper_options.js"></include>
46 var SetWallpaperOptions = options.SetWallpaperOptions; 46 var SetWallpaperOptions = options.SetWallpaperOptions;
47 </if> 47 </if>
48 <if expr="not is_win and not is_macosx"> 48 <if expr="pp_ifdef('use_nss')">
49 <include src="certificate_tree.js"></include> 49 <include src="certificate_tree.js"></include>
50 <include src="certificate_manager.js"></include> 50 <include src="certificate_manager.js"></include>
51 <include src="certificate_restore_overlay.js"></include> 51 <include src="certificate_restore_overlay.js"></include>
52 <include src="certificate_backup_overlay.js"></include> 52 <include src="certificate_backup_overlay.js"></include>
53 <include src="certificate_edit_ca_trust_overlay.js"></include> 53 <include src="certificate_edit_ca_trust_overlay.js"></include>
54 <include src="certificate_import_error_overlay.js"></include> 54 <include src="certificate_import_error_overlay.js"></include>
55 var CertificateManager = options.CertificateManager; 55 var CertificateManager = options.CertificateManager;
56 var CertificateRestoreOverlay = options.CertificateRestoreOverlay; 56 var CertificateRestoreOverlay = options.CertificateRestoreOverlay;
57 var CertificateBackupOverlay = options.CertificateBackupOverlay; 57 var CertificateBackupOverlay = options.CertificateBackupOverlay;
58 var CertificateEditCaTrustOverlay = options.CertificateEditCaTrustOverlay; 58 var CertificateEditCaTrustOverlay = options.CertificateEditCaTrustOverlay;
(...skipping 29 matching lines...) Expand all
88 <include src="profiles_icon_grid.js"></include> 88 <include src="profiles_icon_grid.js"></include>
89 <include src="search_engine_manager.js"></include> 89 <include src="search_engine_manager.js"></include>
90 <include src="search_engine_manager_engine_list.js"></include> 90 <include src="search_engine_manager_engine_list.js"></include>
91 <include src="search_page.js"></include> 91 <include src="search_page.js"></include>
92 <include src="session_restore_overlay.js"></include> 92 <include src="session_restore_overlay.js"></include>
93 <include src="spelling_confirm_overlay.js"></include> 93 <include src="spelling_confirm_overlay.js"></include>
94 <include src="startup_overlay.js"></include> 94 <include src="startup_overlay.js"></include>
95 <include src="../sync_setup_overlay.js"></include> 95 <include src="../sync_setup_overlay.js"></include>
96 <include src="../uber/uber_utils.js"></include> 96 <include src="../uber/uber_utils.js"></include>
97 <include src="options.js"></include> 97 <include src="options.js"></include>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698