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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2236213002: Add quick unlock Settings in options page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 4 years, 4 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
« no previous file with comments | « chrome/browser/resources/options/compiled_resources.gyp ('k') | chrome/browser/resources/options/options.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;lang:language"> 2 <html id="t" i18n-values="dir:textdirection;lang:language">
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 <if expr="chromeos">
7 <link rel="import" href="chrome://settings-frame/options_polymer.html">
8 </if>
6 <link rel="stylesheet" href="chrome://resources/css/bubble.css"> 9 <link rel="stylesheet" href="chrome://resources/css/bubble.css">
7 <link rel="stylesheet" href="chrome://resources/css/bubble_button.css"> 10 <link rel="stylesheet" href="chrome://resources/css/bubble_button.css">
8 <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css"> 11 <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
9 <link rel="stylesheet" href="chrome://resources/css/controlled_indicator.css"> 12 <link rel="stylesheet" href="chrome://resources/css/controlled_indicator.css">
10 <link rel="stylesheet" href="chrome://resources/css/list.css"> 13 <link rel="stylesheet" href="chrome://resources/css/list.css">
11 <link rel="stylesheet" href="chrome://resources/css/overlay.css"> 14 <link rel="stylesheet" href="chrome://resources/css/overlay.css">
12 <link rel="stylesheet" href="chrome://resources/css/spinner.css"> 15 <link rel="stylesheet" href="chrome://resources/css/spinner.css">
13 <link rel="stylesheet" href="chrome://resources/css/throbber.css"> 16 <link rel="stylesheet" href="chrome://resources/css/throbber.css">
14 <link rel="stylesheet" href="chrome://resources/css/tree.css"> 17 <link rel="stylesheet" href="chrome://resources/css/tree.css">
15 <link rel="stylesheet" href="../uber/uber_shared.css"> 18 <link rel="stylesheet" href="../uber/uber_shared.css">
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 <link rel="stylesheet" href="chromeos/accounts_options_page.css"> 58 <link rel="stylesheet" href="chromeos/accounts_options_page.css">
56 <link rel="stylesheet" href="chromeos/arc_opt_out_confirm_overlay.css"> 59 <link rel="stylesheet" href="chromeos/arc_opt_out_confirm_overlay.css">
57 <link rel="stylesheet" href="chromeos/bluetooth.css"> 60 <link rel="stylesheet" href="chromeos/bluetooth.css">
58 <link rel="stylesheet" href="chromeos/change_picture_options.css"> 61 <link rel="stylesheet" href="chromeos/change_picture_options.css">
59 <link rel="stylesheet" href="chromeos/display_options.css"> 62 <link rel="stylesheet" href="chromeos/display_options.css">
60 <link rel="stylesheet" href="chromeos/display_overscan.css"> 63 <link rel="stylesheet" href="chromeos/display_overscan.css">
61 <link rel="stylesheet" href="chromeos/internet_detail.css"> 64 <link rel="stylesheet" href="chromeos/internet_detail.css">
62 <link rel="stylesheet" href="chromeos/keyboard_overlay.css"> 65 <link rel="stylesheet" href="chromeos/keyboard_overlay.css">
63 <link rel="stylesheet" href="chromeos/note_overlay.css"> 66 <link rel="stylesheet" href="chromeos/note_overlay.css">
64 <link rel="stylesheet" href="chromeos/pointer_overlay.css"> 67 <link rel="stylesheet" href="chromeos/pointer_overlay.css">
68 <link rel="stylesheet" href="chromeos/quick_unlock_configure_overlay.css">
65 <link rel="stylesheet" href="chromeos/storage_clear_drive_cache_overlay.css"> 69 <link rel="stylesheet" href="chromeos/storage_clear_drive_cache_overlay.css">
66 <link rel="stylesheet" href="chromeos/storage_manager.css"> 70 <link rel="stylesheet" href="chromeos/storage_manager.css">
67 <link rel="stylesheet" href="factory_reset_overlay.css"> 71 <link rel="stylesheet" href="factory_reset_overlay.css">
68 <link rel="stylesheet" href="../help/channel_change_page.css"> 72 <link rel="stylesheet" href="../help/channel_change_page.css">
69 </if> 73 </if>
70 <if expr="use_nss_certs"> 74 <if expr="use_nss_certs">
71 <link rel="stylesheet" href="certificate_manager.css"> 75 <link rel="stylesheet" href="certificate_manager.css">
72 <link rel="stylesheet" href="certificate_tree.css"> 76 <link rel="stylesheet" href="certificate_tree.css">
73 </if> 77 </if>
74 <script src="chrome://resources/js/action_link.js"></script> 78 <script src="chrome://resources/js/action_link.js"></script>
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 <include src="chromeos/accounts_options.html"> 137 <include src="chromeos/accounts_options.html">
134 <include src="chromeos/arc_opt_out_confirm_overlay.html"> 138 <include src="chromeos/arc_opt_out_confirm_overlay.html">
135 <include src="chromeos/bluetooth_add_device_overlay.html"> 139 <include src="chromeos/bluetooth_add_device_overlay.html">
136 <include src="chromeos/bluetooth_pair_device_overlay.html"> 140 <include src="chromeos/bluetooth_pair_device_overlay.html">
137 <include src="chromeos/change_picture_options.html"> 141 <include src="chromeos/change_picture_options.html">
138 <include src="chromeos/display_options.html"> 142 <include src="chromeos/display_options.html">
139 <include src="chromeos/keyboard_overlay.html"> 143 <include src="chromeos/keyboard_overlay.html">
140 <include src="chromeos/note_overlay.html"> 144 <include src="chromeos/note_overlay.html">
141 <include src="chromeos/pointer_overlay.html"> 145 <include src="chromeos/pointer_overlay.html">
142 <include src="chromeos/power_overlay.html"> 146 <include src="chromeos/power_overlay.html">
147 <include src="chromeos/quick_unlock_configure_overlay.html">
143 <include src="chromeos/storage_manager.html"> 148 <include src="chromeos/storage_manager.html">
144 <include src="factory_reset_overlay.html"> 149 <include src="factory_reset_overlay.html">
145 </if> 150 </if>
146 <if expr="use_nss_certs"> 151 <if expr="use_nss_certs">
147 <include src="certificate_manager.html"> 152 <include src="certificate_manager.html">
148 </if> 153 </if>
149 </div> 154 </div>
150 <div id="overlay-container-2" class="overlay transparent" hidden> 155 <div id="overlay-container-2" class="overlay transparent" hidden>
151 <include src="alert_overlay.html"> 156 <include src="alert_overlay.html">
152 <include src="autofill_edit_address_overlay.html"> 157 <include src="autofill_edit_address_overlay.html">
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 <include src="search_page.html"> 210 <include src="search_page.html">
206 <include src="browser_options.html"> 211 <include src="browser_options.html">
207 </div> 212 </div>
208 </div> 213 </div>
209 </div> 214 </div>
210 </div> 215 </div>
211 216
212 <script src="chrome://resources/js/i18n_template.js"></script> 217 <script src="chrome://resources/js/i18n_template.js"></script>
213 </body> 218 </body>
214 </html> 219 </html>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/compiled_resources.gyp ('k') | chrome/browser/resources/options/options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698