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

Side by Side Diff: chrome/browser/resources/settings/settings_resources.grd

Issue 1094553002: Revert "Speculative revert by sheriff" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
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"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/settings_resources.h" type="rc_header"> 4 <output filename="grit/settings_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="grit/settings_resources_map.cc" 7 <output filename="grit/settings_resources_map.cc"
8 type="resource_file_map_source" /> 8 type="resource_file_map_source" />
9 <output filename="grit/settings_resources_map.h" 9 <output filename="grit/settings_resources_map.h"
10 type="resource_map_header" /> 10 type="resource_map_header" />
11 <output filename="settings_resources.pak" type="data_package" /> 11 <output filename="settings_resources.pak" type="data_package" />
12 </outputs> 12 </outputs>
13 <release seq="1"> 13 <release seq="1">
14 <structures> 14 <structures>
15 <structure name="IDR_SETTINGS_A11Y_PAGE_JS" 15 <structure name="IDR_SETTINGS_A11Y_PAGE_JS"
16 file="a11y_page/a11y_page.js" 16 file="a11y_page/a11y_page.js"
17 type="chrome_html" /> 17 type="chrome_html" />
18 <structure name="IDR_SETTINGS_A11Y_PAGE_HTML" 18 <structure name="IDR_SETTINGS_A11Y_PAGE_HTML"
19 file="a11y_page/a11y_page.html" 19 file="a11y_page/a11y_page.html"
20 type="chrome_html" 20 type="chrome_html"
21 flattenhtml="true" 21 flattenhtml="true"
22 allowexternalscript="true" /> 22 allowexternalscript="true" />
23 <structure name="IDR_SETTINGS_A11Y_PAGE_CSS" 23 <structure name="IDR_SETTINGS_A11Y_PAGE_STYLE_HTML"
24 file="a11y_page/a11y_page.css" 24 file="a11y_page/a11y_page_style.html"
25 type="chrome_html" /> 25 type="chrome_html" />
26 <structure name="IDR_SETTINGS_CHECKBOX_HTML" 26 <structure name="IDR_SETTINGS_CHECKBOX_HTML"
27 file="checkbox/checkbox.html" 27 file="checkbox/checkbox.html"
28 type="chrome_html" /> 28 type="chrome_html" />
29 <structure name="IDR_SETTINGS_CHECKBOX_JS" 29 <structure name="IDR_SETTINGS_CHECKBOX_JS"
30 file="checkbox/checkbox.js" 30 file="checkbox/checkbox.js"
31 type="chrome_html" /> 31 type="chrome_html" />
32 <structure name="IDR_SETTINGS_CHECKBOX_CSS" 32 <structure name="IDR_SETTINGS_CHECKBOX_STYLE_HTML"
33 file="checkbox/checkbox.css" 33 file="checkbox/checkbox_style.html"
34 type="chrome_html" /> 34 type="chrome_html" />
35 <structure name="IDR_SETTINGS_CR_SETTINGS_DRAWER_STYLE_HTML" 35 <structure name="IDR_SETTINGS_CR_SETTINGS_DRAWER_STYLE_HTML"
36 file="settings_drawer/settings_drawer_style.html" 36 file="settings_drawer/settings_drawer_style.html"
37 type="chrome_html" /> 37 type="chrome_html" />
38 <structure name="IDR_SETTINGS_CR_SETTINGS_DRAWER_HTML" 38 <structure name="IDR_SETTINGS_CR_SETTINGS_DRAWER_HTML"
39 file="settings_drawer/settings_drawer.html" 39 file="settings_drawer/settings_drawer.html"
40 type="chrome_html" /> 40 type="chrome_html" />
41 <structure name="IDR_SETTINGS_CR_SETTINGS_DRAWER_JS" 41 <structure name="IDR_SETTINGS_CR_SETTINGS_DRAWER_JS"
42 file="settings_drawer/settings_drawer.js" 42 file="settings_drawer/settings_drawer.js"
43 type="chrome_html" /> 43 type="chrome_html" />
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_HTML" 221 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_HTML"
222 file="internet_page/network_summary.html" 222 file="internet_page/network_summary.html"
223 type="chrome_html" /> 223 type="chrome_html" />
224 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_JS" 224 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_JS"
225 file="internet_page/network_summary.js" 225 file="internet_page/network_summary.js"
226 type="chrome_html" /> 226 type="chrome_html" />
227 </if> 227 </if>
228 </structures> 228 </structures>
229 </release> 229 </release>
230 </grit> 230 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/checkbox/checkbox_style.html ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698