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

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

Issue 806633003: Implement basic toolbar with Material Design and loading progress. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adjust viewport_test.js Created 5 years, 11 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/pdf/index.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 <!-- This comment is only here because changes to resources are not picked up 2 <!-- This comment is only here because changes to resources are not picked up
3 without changes to the corresponding grd file. --> 3 without changes to the corresponding grd file. -->
4 <grit latest_public_release="0" current_release="1"> 4 <grit latest_public_release="0" current_release="1">
5 <outputs> 5 <outputs>
6 <output filename="grit/component_extension_resources.h" type="rc_header"> 6 <output filename="grit/component_extension_resources.h" type="rc_header">
7 <emit emit_type='prepend'></emit> 7 <emit emit_type='prepend'></emit>
8 </output> 8 </output>
9 <output filename="grit/component_extension_resources_map.cc" type="resource_ file_map_source" /> 9 <output filename="grit/component_extension_resources_map.cc" type="resource_ file_map_source" />
10 <output filename="grit/component_extension_resources_map.h" type="resource_m ap_header" /> 10 <output filename="grit/component_extension_resources_map.h" type="resource_m ap_header" />
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 <include name="IDR_NETWORK_CONFIGURATION_CONFIG_CSS" file="chromeos/netw ork_configuration/css/config.css" type="BINDATA" /> 154 <include name="IDR_NETWORK_CONFIGURATION_CONFIG_CSS" file="chromeos/netw ork_configuration/css/config.css" type="BINDATA" />
155 <include name="IDR_NETWORK_CONFIGURATION_NETWORK_CONFIG_JS" file="chrome os/network_configuration/js/network_config.js" type="BINDATA" /> 155 <include name="IDR_NETWORK_CONFIGURATION_NETWORK_CONFIG_JS" file="chrome os/network_configuration/js/network_config.js" type="BINDATA" />
156 <include name="IDR_NETWORK_CONFIGURATION_MAIN_CONFIG_JS" file="chromeos/ network_configuration/js/main_config.js" type="BINDATA" /> 156 <include name="IDR_NETWORK_CONFIGURATION_MAIN_CONFIG_JS" file="chromeos/ network_configuration/js/main_config.js" type="BINDATA" />
157 </if> 157 </if>
158 <if expr="enable_settings_app"> 158 <if expr="enable_settings_app">
159 <include name="IDR_SETTINGS_APP_JS" file="settings_app/settings_app.js" type="BINDATA" /> 159 <include name="IDR_SETTINGS_APP_JS" file="settings_app/settings_app.js" type="BINDATA" />
160 </if> 160 </if>
161 <if expr="enable_plugins"> 161 <if expr="enable_plugins">
162 <include name="IDR_PDF_INDEX_CSS" file="pdf/index.css" allowexternalscri pt="true" type="BINDATA" /> 162 <include name="IDR_PDF_INDEX_CSS" file="pdf/index.css" allowexternalscri pt="true" type="BINDATA" />
163 <include name="IDR_PDF_INDEX_HTML" file="pdf/index.html" allowexternalsc ript="true" type="BINDATA" /> 163 <include name="IDR_PDF_INDEX_HTML" file="pdf/index.html" allowexternalsc ript="true" type="BINDATA" />
164 <include name="IDR_PDF_INDEX_MATERIAL_CSS" file="pdf/index-material.css" allowexternalscript="true" type="BINDATA" />
165 <include name="IDR_PDF_INDEX_MATERIAL_HTML" file="pdf/index-material.htm l" allowexternalscript="true" type="BINDATA" />
164 <include name="IDR_PDF_MAIN_JS" file="pdf/main.js" type="BINDATA" /> 166 <include name="IDR_PDF_MAIN_JS" file="pdf/main.js" type="BINDATA" />
165 <include name="IDR_PDF_PDF_JS" file="pdf/pdf.js" type="BINDATA" /> 167 <include name="IDR_PDF_PDF_JS" file="pdf/pdf.js" type="BINDATA" />
166 <include name="IDR_PDF_INDEX_MATERIAL_HTML" file="pdf/index-material.htm l" allowexternalscript="true" type="BINDATA" />
167 <include name="IDR_PDF_BACKGROUND_JS" file="pdf/background.js" type="BIN DATA" /> 168 <include name="IDR_PDF_BACKGROUND_JS" file="pdf/background.js" type="BIN DATA" />
168 <include name="IDR_PDF_VIEWPORT_JS" file="pdf/viewport.js" type="BINDATA " /> 169 <include name="IDR_PDF_VIEWPORT_JS" file="pdf/viewport.js" type="BINDATA " />
169 <include name="IDR_PDF_OPEN_PDF_PARAMS_PARSER_JS" file="pdf/open_pdf_par ams_parser.js" type="BINDATA" /> 170 <include name="IDR_PDF_OPEN_PDF_PARAMS_PARSER_JS" file="pdf/open_pdf_par ams_parser.js" type="BINDATA" />
170 <include name="IDR_PDF_PDF_SCRIPTING_API_JS" file="pdf/pdf_scripting_api .js" type="BINDATA" /> 171 <include name="IDR_PDF_PDF_SCRIPTING_API_JS" file="pdf/pdf_scripting_api .js" type="BINDATA" />
171 <include name="IDR_PDF_CONTENT_SCRIPT_JS" file="pdf/content_script.js" t ype="BINDATA" /> 172 <include name="IDR_PDF_CONTENT_SCRIPT_JS" file="pdf/content_script.js" t ype="BINDATA" />
172 173
173 <include name="IDR_PDF_VIEWER_BUTTON_CSS" file="pdf/elements/viewer-butt on/viewer-button.css" type="BINDATA" /> 174 <include name="IDR_PDF_VIEWER_BUTTON_CSS" file="pdf/elements/viewer-butt on/viewer-button.css" type="BINDATA" />
174 <include name="IDR_PDF_VIEWER_BUTTON_HTML" file="pdf/elements/viewer-but ton/viewer-button.html" type="BINDATA" /> 175 <include name="IDR_PDF_VIEWER_BUTTON_HTML" file="pdf/elements/viewer-but ton/viewer-button.html" type="BINDATA" />
175 <include name="IDR_PDF_VIEWER_BUTTON_JS" file="pdf/elements/viewer-butto n/viewer-button.js" type="BINDATA" /> 176 <include name="IDR_PDF_VIEWER_BUTTON_JS" file="pdf/elements/viewer-butto n/viewer-button.js" type="BINDATA" />
176 <include name="IDR_PDF_VIEWER_ERROR_SCREEN_CSS" file="pdf/elements/viewe r-error-screen/viewer-error-screen.css" type="BINDATA" /> 177 <include name="IDR_PDF_VIEWER_ERROR_SCREEN_CSS" file="pdf/elements/viewe r-error-screen/viewer-error-screen.css" type="BINDATA" />
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 <!-- The next two files have a .png extension since grit for some reason 257 <!-- The next two files have a .png extension since grit for some reason
257 won't compile these files in if they are named .nmf/.pexe or 258 won't compile these files in if they are named .nmf/.pexe or
258 anything remotely similar to their actual extension. Naming these 259 anything remotely similar to their actual extension. Naming these
259 .js or .html breaks all kinds of presubmit checks, hence .png seems 260 .js or .html breaks all kinds of presubmit checks, hence .png seems
260 to be the only viable option at the moment. --> 261 to be the only viable option at the moment. -->
261 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_NMF" file="whis pernet_proxy/whispernet_proxy.nmf.png" type="BINDATA" /> 262 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_NMF" file="whis pernet_proxy/whispernet_proxy.nmf.png" type="BINDATA" />
262 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_PEXE" file="whi spernet_proxy/whispernet_proxy_pnacl.pexe.png" type="BINDATA" /> 263 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_PEXE" file="whi spernet_proxy/whispernet_proxy_pnacl.pexe.png" type="BINDATA" />
263 </includes> 264 </includes>
264 </release> 265 </release>
265 </grit> 266 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/pdf/index.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698