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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2157673002: Browser tests for the quick_unlock settings pages. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pin-unlock-quick-unlock-interface
Patch Set: Address comments Created 4 years, 2 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 | « no previous file | chrome/browser/resources/settings/icons.html » ('j') | no next file with comments »
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"
22 file="settings/icons.html"
23 type="chrome_html"
24 flattenhtml="true"
25 allowexternalscript="true" />
21 <structure name="IDR_OPTIONS_PIN_KEYBOARD_HTML" 26 <structure name="IDR_OPTIONS_PIN_KEYBOARD_HTML"
22 file="chromeos/quick_unlock/pin_keyboard.html" 27 file="chromeos/quick_unlock/pin_keyboard.html"
23 type="chrome_html" 28 type="chrome_html"
24 flattenhtml="true" 29 flattenhtml="true"
25 allowexternalscript="true" /> 30 allowexternalscript="true" />
26 <structure name="IDR_OPTIONS_PIN_KEYBOARD_JS" 31 <structure name="IDR_OPTIONS_PIN_KEYBOARD_JS"
27 file="chromeos/quick_unlock/pin_keyboard.js" 32 file="chromeos/quick_unlock/pin_keyboard.js"
28 type="chrome_html" 33 type="chrome_html"
29 flattenhtml="true" /> 34 flattenhtml="true" />
30 <structure name="IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_JS" 35 <structure name="IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_JS"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 flattenhtml="true" /> 103 flattenhtml="true" />
99 <structure name="IDR_OPTIONS_POLYMER_ELEMENTS_HTML" 104 <structure name="IDR_OPTIONS_POLYMER_ELEMENTS_HTML"
100 file="options/options_polymer.html" 105 file="options/options_polymer.html"
101 type="chrome_html" 106 type="chrome_html"
102 flattenhtml="true" 107 flattenhtml="true"
103 allowexternalscript="true" /> 108 allowexternalscript="true" />
104 </if> 109 </if>
105 </structures> 110 </structures>
106 </release> 111 </release>
107 </grit> 112 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/icons.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698