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

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: incorporate comments from jdufault@ 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
« chrome/browser/resources/chromeos/quick_unlock/pin_keyboard.html ('K') | « 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 <link rel="import" href="chrome://resources/html/polymer.html">
7 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
8 <link rel="import" href="chrome://resources/cr_elements/icons.html">
9 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
10 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html ">
11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html">
12 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/pape r-radio-button.html">
13 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
14 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
15 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
16 <link rel="import" href="chrome://settings-frame/people_page/pin_keyboard.html">
17 <link rel="import" href="chrome://settings-frame/route.html">
18 <link rel="import" href="chrome://settings-frame/prefs/prefs_types.html">
19 <link rel="import" href="chrome://settings-frame/settings_shared_css.html">
20 <link rel="import" href="chrome://settings-frame/settings_vars_css.html">
21 <link rel="import" href="chrome://settings-frame/prefs/prefs_behavior.html">
22 <link rel="import" href="chrome://settings-frame/people_page/setup_pin_dialog.ht ml">
23 <link rel="import" href="chrome://settings-frame/people_page/password_prompt_dia log.html">
24 <link rel="import" href="chrome://settings-frame/people_page/lock_state_behavior .html">
25 <link rel="import" href="chrome://settings-frame/people_page/lock_screen.html">
26
6 <link rel="stylesheet" href="chrome://resources/css/bubble.css"> 27 <link rel="stylesheet" href="chrome://resources/css/bubble.css">
7 <link rel="stylesheet" href="chrome://resources/css/bubble_button.css"> 28 <link rel="stylesheet" href="chrome://resources/css/bubble_button.css">
8 <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css"> 29 <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
9 <link rel="stylesheet" href="chrome://resources/css/controlled_indicator.css"> 30 <link rel="stylesheet" href="chrome://resources/css/controlled_indicator.css">
10 <link rel="stylesheet" href="chrome://resources/css/list.css"> 31 <link rel="stylesheet" href="chrome://resources/css/list.css">
11 <link rel="stylesheet" href="chrome://resources/css/overlay.css"> 32 <link rel="stylesheet" href="chrome://resources/css/overlay.css">
12 <link rel="stylesheet" href="chrome://resources/css/spinner.css"> 33 <link rel="stylesheet" href="chrome://resources/css/spinner.css">
13 <link rel="stylesheet" href="chrome://resources/css/throbber.css"> 34 <link rel="stylesheet" href="chrome://resources/css/throbber.css">
14 <link rel="stylesheet" href="chrome://resources/css/tree.css"> 35 <link rel="stylesheet" href="chrome://resources/css/tree.css">
15 <link rel="stylesheet" href="../uber/uber_shared.css"> 36 <link rel="stylesheet" href="../uber/uber_shared.css">
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 <link rel="stylesheet" href="chromeos/arc_opt_out_confirm_overlay.css"> 77 <link rel="stylesheet" href="chromeos/arc_opt_out_confirm_overlay.css">
57 <link rel="stylesheet" href="chromeos/bluetooth.css"> 78 <link rel="stylesheet" href="chromeos/bluetooth.css">
58 <link rel="stylesheet" href="chromeos/change_picture_options.css"> 79 <link rel="stylesheet" href="chromeos/change_picture_options.css">
59 <link rel="stylesheet" href="chromeos/consumer_management_overlay.css"> 80 <link rel="stylesheet" href="chromeos/consumer_management_overlay.css">
60 <link rel="stylesheet" href="chromeos/display_options.css"> 81 <link rel="stylesheet" href="chromeos/display_options.css">
61 <link rel="stylesheet" href="chromeos/display_overscan.css"> 82 <link rel="stylesheet" href="chromeos/display_overscan.css">
62 <link rel="stylesheet" href="chromeos/internet_detail.css"> 83 <link rel="stylesheet" href="chromeos/internet_detail.css">
63 <link rel="stylesheet" href="chromeos/keyboard_overlay.css"> 84 <link rel="stylesheet" href="chromeos/keyboard_overlay.css">
64 <link rel="stylesheet" href="chromeos/note_overlay.css"> 85 <link rel="stylesheet" href="chromeos/note_overlay.css">
65 <link rel="stylesheet" href="chromeos/pointer_overlay.css"> 86 <link rel="stylesheet" href="chromeos/pointer_overlay.css">
87 <link rel="stylesheet" href="chromeos/quick_unlock_configure_overlay.css">
66 <link rel="stylesheet" href="chromeos/storage_clear_drive_cache_overlay.css"> 88 <link rel="stylesheet" href="chromeos/storage_clear_drive_cache_overlay.css">
67 <link rel="stylesheet" href="chromeos/storage_manager.css"> 89 <link rel="stylesheet" href="chromeos/storage_manager.css">
68 <link rel="stylesheet" href="factory_reset_overlay.css"> 90 <link rel="stylesheet" href="factory_reset_overlay.css">
69 <link rel="stylesheet" href="../help/channel_change_page.css"> 91 <link rel="stylesheet" href="../help/channel_change_page.css">
70 </if> 92 </if>
71 <if expr="use_nss_certs"> 93 <if expr="use_nss_certs">
72 <link rel="stylesheet" href="certificate_manager.css"> 94 <link rel="stylesheet" href="certificate_manager.css">
73 <link rel="stylesheet" href="certificate_tree.css"> 95 <link rel="stylesheet" href="certificate_tree.css">
74 </if> 96 </if>
75 <script src="chrome://resources/js/action_link.js"></script> 97 <script src="chrome://resources/js/action_link.js"></script>
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 <include src="chromeos/arc_opt_out_confirm_overlay.html"> 157 <include src="chromeos/arc_opt_out_confirm_overlay.html">
136 <include src="chromeos/bluetooth_add_device_overlay.html"> 158 <include src="chromeos/bluetooth_add_device_overlay.html">
137 <include src="chromeos/bluetooth_pair_device_overlay.html"> 159 <include src="chromeos/bluetooth_pair_device_overlay.html">
138 <include src="chromeos/change_picture_options.html"> 160 <include src="chromeos/change_picture_options.html">
139 <include src="chromeos/consumer_management_overlay.html"> 161 <include src="chromeos/consumer_management_overlay.html">
140 <include src="chromeos/display_options.html"> 162 <include src="chromeos/display_options.html">
141 <include src="chromeos/keyboard_overlay.html"> 163 <include src="chromeos/keyboard_overlay.html">
142 <include src="chromeos/note_overlay.html"> 164 <include src="chromeos/note_overlay.html">
143 <include src="chromeos/pointer_overlay.html"> 165 <include src="chromeos/pointer_overlay.html">
144 <include src="chromeos/power_overlay.html"> 166 <include src="chromeos/power_overlay.html">
167 <include src="chromeos/quick_unlock_configure_overlay.html">
145 <include src="chromeos/storage_manager.html"> 168 <include src="chromeos/storage_manager.html">
146 <include src="factory_reset_overlay.html"> 169 <include src="factory_reset_overlay.html">
147 </if> 170 </if>
148 <if expr="use_nss_certs"> 171 <if expr="use_nss_certs">
149 <include src="certificate_manager.html"> 172 <include src="certificate_manager.html">
150 </if> 173 </if>
151 </div> 174 </div>
152 <div id="overlay-container-2" class="overlay transparent" hidden> 175 <div id="overlay-container-2" class="overlay transparent" hidden>
153 <include src="alert_overlay.html"> 176 <include src="alert_overlay.html">
154 <include src="autofill_edit_address_overlay.html"> 177 <include src="autofill_edit_address_overlay.html">
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 <include src="search_page.html"> 230 <include src="search_page.html">
208 <include src="browser_options.html"> 231 <include src="browser_options.html">
209 </div> 232 </div>
210 </div> 233 </div>
211 </div> 234 </div>
212 </div> 235 </div>
213 236
214 <script src="chrome://resources/js/i18n_template.js"></script> 237 <script src="chrome://resources/js/i18n_template.js"></script>
215 </body> 238 </body>
216 </html> 239 </html>
OLDNEW
« chrome/browser/resources/chromeos/quick_unlock/pin_keyboard.html ('K') | « 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