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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options2/options.html

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, 6 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
« no previous file with comments | « chrome/browser/resources/options2/browser_options.html ('k') | chrome/browser/resources/options2/options_bundle.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE HTML> 1 <!DOCTYPE HTML>
2 <html id="t" i18n-values="dir:textdirection"> 2 <html id="t" i18n-values="dir:textdirection">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <title i18n-content="optionsPageTitle"></title> 5 <title i18n-content="optionsPageTitle"></title>
6 <link rel="icon" href="chrome://theme/IDR_SETTINGS_FAVICON"> 6 <link rel="icon" href="chrome://theme/IDR_SETTINGS_FAVICON">
7 <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css"> 7 <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
8 <link rel="stylesheet" href="chrome://resources/css/list.css"> 8 <link rel="stylesheet" href="chrome://resources/css/list.css">
9 <link rel="stylesheet" href="chrome://resources/css/overlay.css"> 9 <link rel="stylesheet" href="chrome://resources/css/overlay.css">
10 <link rel="stylesheet" href="chrome://resources/css/spinner.css"> 10 <link rel="stylesheet" href="chrome://resources/css/spinner.css">
(...skipping 26 matching lines...) Expand all
37 <if expr="pp_ifdef('chromeos')"> 37 <if expr="pp_ifdef('chromeos')">
38 <link rel="stylesheet" href="chromeos/accounts_options_page.css"> 38 <link rel="stylesheet" href="chromeos/accounts_options_page.css">
39 <link rel="stylesheet" href="chromeos/bluetooth.css"> 39 <link rel="stylesheet" href="chromeos/bluetooth.css">
40 <link rel="stylesheet" href="chromeos/image_picker.css"> 40 <link rel="stylesheet" href="chromeos/image_picker.css">
41 <link rel="stylesheet" href="chromeos/internet_detail.css"> 41 <link rel="stylesheet" href="chromeos/internet_detail.css">
42 <link rel="stylesheet" href="chromeos/pointer_overlay.css"> 42 <link rel="stylesheet" href="chromeos/pointer_overlay.css">
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 <link rel="stylesheet" href="chromeos/set_wallpaper_options.css"> 45 <link rel="stylesheet" href="chromeos/set_wallpaper_options.css">
46 </if> 46 </if>
47 <if expr="not is_win and not is_macosx"> 47 <if expr="pp_ifdef('use_nss')">
48 <link rel="stylesheet" href="certificate_manager.css"> 48 <link rel="stylesheet" href="certificate_manager.css">
49 <link rel="stylesheet" href="certificate_tree.css"> 49 <link rel="stylesheet" href="certificate_tree.css">
50 </if> 50 </if>
51 <script src="chrome://resources/css/tree.css.js"></script> 51 <script src="chrome://resources/css/tree.css.js"></script>
52 <script src="chrome://resources/js/cr.js"></script> 52 <script src="chrome://resources/js/cr.js"></script>
53 <script src="chrome://resources/js/event_tracker.js"></script> 53 <script src="chrome://resources/js/event_tracker.js"></script>
54 <script src="chrome://resources/js/cr/event_target.js"></script> 54 <script src="chrome://resources/js/cr/event_target.js"></script>
55 <script src="chrome://resources/js/cr/ui.js"></script> 55 <script src="chrome://resources/js/cr/ui.js"></script>
56 <script src="chrome://resources/js/cr/ui/touch_handler.js"></script> 56 <script src="chrome://resources/js/cr/ui/touch_handler.js"></script>
57 <script src="chrome://resources/js/cr/ui/array_data_model.js"></script> 57 <script src="chrome://resources/js/cr/ui/array_data_model.js"></script>
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 <include src="chromeos/accounts_options.html"> 95 <include src="chromeos/accounts_options.html">
96 <include src="chromeos/bluetooth_add_device_overlay.html"> 96 <include src="chromeos/bluetooth_add_device_overlay.html">
97 <include src="chromeos/bluetooth_pair_device_overlay.html"> 97 <include src="chromeos/bluetooth_pair_device_overlay.html">
98 <include src="chromeos/change_picture_options.html"> 98 <include src="chromeos/change_picture_options.html">
99 <include src="chromeos/keyboard_overlay.html"> 99 <include src="chromeos/keyboard_overlay.html">
100 <include src="chromeos/pointer_overlay.html"> 100 <include src="chromeos/pointer_overlay.html">
101 </if> 101 </if>
102 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_ash')"> 102 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_ash')">
103 <include src="chromeos/set_wallpaper_options.html"> 103 <include src="chromeos/set_wallpaper_options.html">
104 </if> 104 </if>
105 <if expr="not is_win and not is_macosx"> 105 <if expr="pp_ifdef('use_nss')">
106 <include src="certificate_manager.html"> 106 <include src="certificate_manager.html">
107 </if> 107 </if>
108 </div> 108 </div>
109 <div id="overlay-container-2" class="overlay transparent" hidden> 109 <div id="overlay-container-2" class="overlay transparent" hidden>
110 <include src="alert_overlay.html"> 110 <include src="alert_overlay.html">
111 <include src="autofill_edit_address_overlay.html"> 111 <include src="autofill_edit_address_overlay.html">
112 <include src="autofill_edit_creditcard_overlay.html"> 112 <include src="autofill_edit_creditcard_overlay.html">
113 <include src="content_settings_exceptions_area.html"> 113 <include src="content_settings_exceptions_area.html">
114 <include src="cookies_view.html"> 114 <include src="cookies_view.html">
115 <include src="handler_options.html"> 115 <include src="handler_options.html">
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 <div class="managed-prefs-gradient"> 151 <div class="managed-prefs-gradient">
152 <span id="managed-prefs-text" class="managed-prefs-text"></span> 152 <span id="managed-prefs-text" class="managed-prefs-text"></span>
153 </div> 153 </div>
154 </div> 154 </div>
155 </div> 155 </div>
156 156
157 <script src="chrome://settings-frame/strings.js"></script> 157 <script src="chrome://settings-frame/strings.js"></script>
158 <script src="chrome://resources/js/i18n_template2.js"></script> 158 <script src="chrome://resources/js/i18n_template2.js"></script>
159 </body> 159 </body>
160 </html> 160 </html>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/browser_options.html ('k') | chrome/browser/resources/options2/options_bundle.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698