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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options_resources.grd

Issue 2691943005: fix quick unlock config in options (Closed)
Patch Set: incorporate comments Created 3 years, 9 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/options.html ('k') | chrome/browser/resources/settings/people_page/lock_screen.js » ('j') | chrome/browser/resources/settings/people_page/lock_screen.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <grit latest_public_release="0" current_release="1" output_all_resource_defines= "false"> 2 <grit latest_public_release="0" current_release="1" output_all_resource_defines= "false">
3 <outputs> 3 <outputs>
4 <output filename="grit/options_resources.h" type="rc_header"> 4 <output filename="grit/options_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="options_resources.pak" type="data_package" /> 7 <output filename="options_resources.pak" type="data_package" />
8 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <structures> 10 <structures>
11 <structure name="IDR_OPTIONS_BUNDLE_JS" 11 <structure name="IDR_OPTIONS_BUNDLE_JS"
12 file="options/options_bundle.js" 12 file="options/options_bundle.js"
13 flattenhtml="true" 13 flattenhtml="true"
14 type="chrome_html" /> 14 type="chrome_html" />
15 <structure name="IDR_OPTIONS_HTML" 15 <structure name="IDR_OPTIONS_HTML"
16 file="options/options.html" 16 file="options/options.html"
17 flattenhtml="true" 17 flattenhtml="true"
18 allowexternalscript="true" 18 allowexternalscript="true"
19 type="chrome_html" /> 19 type="chrome_html" />
20 <if expr="chromeos"> 20 <if expr="chromeos">
21 <structure name="IDR_OPTIONS_ICONS_HTML" 21 <structure name="IDR_OPTIONS_ICONS_HTML"
22 file="settings/icons.html" 22 file="settings/icons.html"
23 type="chrome_html" 23 type="chrome_html"
24 flattenhtml="true" 24 preprocess="true" />
25 allowexternalscript="true" />
26 <structure name="IDR_OPTIONS_PIN_KEYBOARD_HTML" 25 <structure name="IDR_OPTIONS_PIN_KEYBOARD_HTML"
27 file="chromeos/quick_unlock/pin_keyboard.html" 26 file="chromeos/quick_unlock/pin_keyboard.html"
28 type="chrome_html" 27 type="chrome_html"
29 flattenhtml="true" 28 preprocess="true" />
30 allowexternalscript="true" />
31 <structure name="IDR_OPTIONS_PIN_KEYBOARD_JS" 29 <structure name="IDR_OPTIONS_PIN_KEYBOARD_JS"
32 file="chromeos/quick_unlock/pin_keyboard.js" 30 file="chromeos/quick_unlock/pin_keyboard.js"
33 type="chrome_html" 31 type="chrome_html"
34 flattenhtml="true" /> 32 preprocess="true" />
35 <structure name="IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_JS" 33 <structure name="IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_JS"
36 file="settings/people_page/password_prompt_dialog.js" 34 file="settings/people_page/password_prompt_dialog.js"
37 type="chrome_html" /> 35 type="chrome_html" />
38 <structure name="IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_HTML" 36 <structure name="IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_HTML"
39 file="settings/people_page/password_prompt_dialog.html" 37 file="settings/people_page/password_prompt_dialog.html"
40 type="chrome_html" 38 type="chrome_html" />
41 flattenhtml="true"
42 allowexternalscript="true" />
43 <structure name="IDR_OPTIONS_LOCK_SCREEN_CONSTANTS_JS" 39 <structure name="IDR_OPTIONS_LOCK_SCREEN_CONSTANTS_JS"
44 file="settings/people_page/lock_screen_constants.js" 40 file="settings/people_page/lock_screen_constants.js"
45 type="chrome_html" /> 41 type="chrome_html" />
46 <structure name="IDR_OPTIONS_LOCK_SCREEN_CONSTANTS_HTML" 42 <structure name="IDR_OPTIONS_LOCK_SCREEN_CONSTANTS_HTML"
47 file="settings/people_page/lock_screen_constants.html" 43 file="settings/people_page/lock_screen_constants.html"
48 type="chrome_html" 44 type="chrome_html" />
49 flattenhtml="true"
50 allowexternalscript="true" />
51 <structure name="IDR_OPTIONS_LOCK_STATE_BEHAVIOR_JS" 45 <structure name="IDR_OPTIONS_LOCK_STATE_BEHAVIOR_JS"
52 file="settings/people_page/lock_state_behavior.js" 46 file="settings/people_page/lock_state_behavior.js"
53 type="chrome_html" /> 47 type="chrome_html" />
54 <structure name="IDR_OPTIONS_LOCK_STATE_BEHAVIOR_HTML" 48 <structure name="IDR_OPTIONS_LOCK_STATE_BEHAVIOR_HTML"
55 file="settings/people_page/lock_state_behavior.html" 49 file="settings/people_page/lock_state_behavior.html"
56 type="chrome_html" 50 type="chrome_html" />
57 flattenhtml="true"
58 allowexternalscript="true" />
59 <structure name="IDR_OPTIONS_SETUP_PIN_DIALOG_JS" 51 <structure name="IDR_OPTIONS_SETUP_PIN_DIALOG_JS"
60 file="settings/people_page/setup_pin_dialog.js" 52 file="settings/people_page/setup_pin_dialog.js"
61 type="chrome_html" /> 53 type="chrome_html" />
62 <structure name="IDR_OPTIONS_SETUP_PIN_DIALOG_HTML" 54 <structure name="IDR_OPTIONS_SETUP_PIN_DIALOG_HTML"
63 file="settings/people_page/setup_pin_dialog.html" 55 file="settings/people_page/setup_pin_dialog.html"
64 type="chrome_html" 56 type="chrome_html" />
65 flattenhtml="true"
66 allowexternalscript="true" />
67 <structure name="IDR_OPTIONS_FINGERPRINT_LIST_JS" 57 <structure name="IDR_OPTIONS_FINGERPRINT_LIST_JS"
68 file="settings/people_page/fingerprint_list.js" 58 file="settings/people_page/fingerprint_list.js"
69 type="chrome_html" /> 59 type="chrome_html" />
70 <structure name="IDR_OPTIONS_FINGERPRINT_LIST_HTML" 60 <structure name="IDR_OPTIONS_FINGERPRINT_LIST_HTML"
71 file="settings/people_page/fingerprint_list.html" 61 file="settings/people_page/fingerprint_list.html"
72 type="chrome_html" /> 62 type="chrome_html" />
73 <structure name="IDR_OPTIONS_SETUP_FINGERPRINT_DIALOG_JS" 63 <structure name="IDR_OPTIONS_SETUP_FINGERPRINT_DIALOG_JS"
74 file="settings/people_page/setup_fingerprint_dialog.js" 64 file="settings/people_page/setup_fingerprint_dialog.js"
75 type="chrome_html" /> 65 type="chrome_html" />
76 <structure name="IDR_OPTIONS_SETUP_FINGERPRINT_DIALOG_HTML" 66 <structure name="IDR_OPTIONS_SETUP_FINGERPRINT_DIALOG_HTML"
77 file="settings/people_page/setup_fingerprint_dialog.html" 67 file="settings/people_page/setup_fingerprint_dialog.html"
78 type="chrome_html" /> 68 type="chrome_html" />
79 <structure name="IDR_OPTIONS_FINGERPRINT_PROGRESS_ARC_JS" 69 <structure name="IDR_OPTIONS_FINGERPRINT_PROGRESS_ARC_JS"
80 file="settings/people_page/fingerprint_progress_arc.js" 70 file="settings/people_page/fingerprint_progress_arc.js"
81 type="chrome_html" /> 71 type="chrome_html" />
82 <structure name="IDR_OPTIONS_FINGERPRINT_PROGRESS_ARC_HTML" 72 <structure name="IDR_OPTIONS_FINGERPRINT_PROGRESS_ARC_HTML"
83 file="settings/people_page/fingerprint_progress_arc.html" 73 file="settings/people_page/fingerprint_progress_arc.html"
84 type="chrome_html" /> 74 type="chrome_html" />
85 <structure name="IDR_OPTIONS_FINGERPRINT_BROWSER_PROXY_JS" 75 <structure name="IDR_OPTIONS_FINGERPRINT_BROWSER_PROXY_JS"
86 file="settings/people_page/fingerprint_browser_proxy.js" 76 file="settings/people_page/fingerprint_browser_proxy.js"
87 type="chrome_html" /> 77 type="chrome_html" />
88 <structure name="IDR_OPTIONS_FINGERPRINT_BROWSER_PROXY_HTML" 78 <structure name="IDR_OPTIONS_FINGERPRINT_BROWSER_PROXY_HTML"
89 file="settings/people_page/fingerprint_browser_proxy.html" 79 file="settings/people_page/fingerprint_browser_proxy.html"
90 type="chrome_html" /> 80 type="chrome_html" />
91 <structure name="IDR_OPTIONS_LOCK_SCREEN_JS" 81 <structure name="IDR_OPTIONS_LOCK_SCREEN_JS"
92 file="settings/people_page/lock_screen.js" 82 file="settings/people_page/lock_screen.js"
93 type="chrome_html" /> 83 type="chrome_html" />
94 <structure name="IDR_OPTIONS_LOCK_SCREEN_HTML" 84 <structure name="IDR_OPTIONS_LOCK_SCREEN_HTML"
95 file="settings/people_page/lock_screen.html" 85 file="settings/people_page/lock_screen.html"
96 type="chrome_html" 86 type="chrome_html" />
97 flattenhtml="true"
98 allowexternalscript="true" />
99 <structure name="IDR_OPTIONS_ROUTE_HTML" 87 <structure name="IDR_OPTIONS_ROUTE_HTML"
100 file="settings/route.html" 88 file="settings/route.html"
101 type="chrome_html" 89 type="chrome_html" />
102 flattenhtml="true"
103 allowexternalscript="true" />
104 <structure name="IDR_OPTIONS_ROUTE_JS" 90 <structure name="IDR_OPTIONS_ROUTE_JS"
105 file="settings/route.js" 91 file="settings/route.js"
106 type="chrome_html" 92 type="chrome_html"
107 flattenhtml="true" /> 93 preprocess="true" />
108 <structure name="IDR_SETTINGS_SHARED_CSS_HTML" 94 <structure name="IDR_SETTINGS_SHARED_CSS_HTML"
109 file="settings/settings_shared_css.html" 95 file="settings/settings_shared_css.html"
110 type="chrome_html" 96 type="chrome_html" />
111 flattenhtml="true"
112 allowexternalscript="true" />
113 <structure name="IDR_SETTINGS_TOGGLE_BUTTON_HTML" 97 <structure name="IDR_SETTINGS_TOGGLE_BUTTON_HTML"
114 file="settings/controls/settings_toggle_button.html" 98 file="settings/controls/settings_toggle_button.html"
115 type="chrome_html" 99 type="chrome_html" />
116 flattenhtml="true"
117 allowexternalscript="true" />
118 <structure name="IDR_SETTINGS_TOGGLE_BUTTON_JS" 100 <structure name="IDR_SETTINGS_TOGGLE_BUTTON_JS"
119 file="settings/controls/settings_toggle_button.js" 101 file="settings/controls/settings_toggle_button.js"
120 type="chrome_html" 102 type="chrome_html" />
121 flattenhtml="true" />
122 <structure name="IDR_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_HTML" 103 <structure name="IDR_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_HTML"
123 file="settings/controls/settings_boolean_control_behavior.htm l" 104 file="settings/controls/settings_boolean_control_behavior.htm l"
124 type="chrome_html" 105 type="chrome_html" />
125 flattenhtml="true"
126 allowexternalscript="true" />
127 <structure name="IDR_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_JS" 106 <structure name="IDR_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_JS"
128 file="settings/controls/settings_boolean_control_behavior.js" 107 file="settings/controls/settings_boolean_control_behavior.js"
129 type="chrome_html" 108 type="chrome_html" />
130 flattenhtml="true" />
131 <structure name="IDR_SETTINGS_PREF_CONTROL_BEHAVIOR_HTML" 109 <structure name="IDR_SETTINGS_PREF_CONTROL_BEHAVIOR_HTML"
132 file="settings/controls/pref_control_behavior.html" 110 file="settings/controls/pref_control_behavior.html"
133 type="chrome_html" 111 type="chrome_html" />
134 flattenhtml="true"
135 allowexternalscript="true" />
136 <structure name="IDR_SETTINGS_PREF_CONTROL_BEHAVIOR_JS" 112 <structure name="IDR_SETTINGS_PREF_CONTROL_BEHAVIOR_JS"
137 file="settings/controls/pref_control_behavior.js" 113 file="settings/controls/pref_control_behavior.js"
138 type="chrome_html" 114 type="chrome_html" />
139 flattenhtml="true" />
140 <structure name="IDR_SETTINGS_VARS_CSS_HTML" 115 <structure name="IDR_SETTINGS_VARS_CSS_HTML"
141 file="settings/settings_vars_css.html" 116 file="settings/settings_vars_css.html"
142 type="chrome_html" 117 type="chrome_html" />
143 flattenhtml="true"
144 allowexternalscript="true" />
145 <structure name="IDR_SETTINGS_PREFS_BEHAVIOR_HTML" 118 <structure name="IDR_SETTINGS_PREFS_BEHAVIOR_HTML"
146 file="settings/prefs/prefs_behavior.html" 119 file="settings/prefs/prefs_behavior.html"
147 type="chrome_html" 120 type="chrome_html" />
148 flattenhtml="true"
149 allowexternalscript="true" />
150 <structure name="IDR_SETTINGS_PREFS_BEHAVIOR_JS" 121 <structure name="IDR_SETTINGS_PREFS_BEHAVIOR_JS"
151 file="settings/prefs/prefs_behavior.js" 122 file="settings/prefs/prefs_behavior.js"
152 type="chrome_html" 123 type="chrome_html" />
153 flattenhtml="true" />
154 <structure name="IDR_SETTINGS_PREFS_TYPES_HTML" 124 <structure name="IDR_SETTINGS_PREFS_TYPES_HTML"
155 file="settings/prefs/prefs_types.html" 125 file="settings/prefs/prefs_types.html"
156 type="chrome_html" 126 type="chrome_html" />
157 flattenhtml="true"
158 allowexternalscript="true" />
159 <structure name="IDR_SETTINGS_PREFS_TYPES_JS" 127 <structure name="IDR_SETTINGS_PREFS_TYPES_JS"
160 file="settings/prefs/prefs_types.js" 128 file="settings/prefs/prefs_types.js"
161 type="chrome_html" 129 type="chrome_html" />
162 flattenhtml="true" /> 130 <structure name="IDR_SETTINGS_PREFS_HTML"
131 file="settings/prefs/prefs.html"
132 type="chrome_html" />
133 <structure name="IDR_SETTINGS_PREFS_JS"
134 file="settings/prefs/prefs.js"
135 type="chrome_html" />
136 <structure name="IDR_OPTIONS_I18N_SETUP_HTML"
137 file="options/i18n_setup.html"
138 type="chrome_html" />
163 <structure name="IDR_OPTIONS_POLYMER_ELEMENTS_HTML" 139 <structure name="IDR_OPTIONS_POLYMER_ELEMENTS_HTML"
164 file="options/options_polymer.html" 140 file="options/options_polymer.html"
165 type="chrome_html" 141 type="chrome_html" />
166 flattenhtml="true"
167 allowexternalscript="true" />
168 </if> 142 </if>
169 </structures> 143 </structures>
170 </release> 144 </release>
171 </grit> 145 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.html ('k') | chrome/browser/resources/settings/people_page/lock_screen.js » ('j') | chrome/browser/resources/settings/people_page/lock_screen.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698