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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 853603002: Merge html-office-public repo into src (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « DEPS ('k') | chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_fit_page.png » ('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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_MAIN_JS" file="pdf/main.js" type="BINDATA" /> 164 <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" /> 165 <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" /> 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" /> 167 <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 " /> 168 <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" /> 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_PDF_SCRIPTING_API_JS" file="pdf/pdf_scripting_api .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_CONTENT_SCRIPT_JS" file="pdf/content_script.js" t ype="BINDATA" /> 171 <include name="IDR_PDF_CONTENT_SCRIPT_JS" file="pdf/content_script.js" t ype="BINDATA" />
172 172
173 <include name="IDR_PDF_VIEWER_BUTTON_CSS" file="pdf/html_office/elements /viewer-button/viewer-button.css" type="BINDATA" /> 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_HTML" file="pdf/html_office/element s/viewer-button/viewer-button.html" 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_JS" file="pdf/html_office/elements/ viewer-button/viewer-button.js" 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_ERROR_SCREEN_CSS" file="pdf/html_office/el ements/viewer-error-screen/viewer-error-screen.css" 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_HTML" file="pdf/html_office/e lements/viewer-error-screen/viewer-error-screen.html" type="BINDATA" /> 177 <include name="IDR_PDF_VIEWER_ERROR_SCREEN_HTML" file="pdf/elements/view er-error-screen/viewer-error-screen.html" type="BINDATA" />
178 <include name="IDR_PDF_VIEWER_ERROR_SCREEN_JS" file="pdf/html_office/ele ments/viewer-error-screen/viewer-error-screen.js" type="BINDATA" /> 178 <include name="IDR_PDF_VIEWER_ERROR_SCREEN_JS" file="pdf/elements/viewer -error-screen/viewer-error-screen.js" type="BINDATA" />
179 <include name="IDR_PDF_VIEWER_PAGE_INDICATOR_CSS" file="pdf/html_office/ elements/viewer-page-indicator/viewer-page-indicator.css" type="BINDATA" /> 179 <include name="IDR_PDF_VIEWER_PAGE_INDICATOR_CSS" file="pdf/elements/vie wer-page-indicator/viewer-page-indicator.css" type="BINDATA" />
180 <include name="IDR_PDF_VIEWER_PAGE_INDICATOR_HTML" file="pdf/html_office /elements/viewer-page-indicator/viewer-page-indicator.html" type="BINDATA" /> 180 <include name="IDR_PDF_VIEWER_PAGE_INDICATOR_HTML" file="pdf/elements/vi ewer-page-indicator/viewer-page-indicator.html" type="BINDATA" />
181 <include name="IDR_PDF_VIEWER_PAGE_INDICATOR_JS" file="pdf/html_office/e lements/viewer-page-indicator/viewer-page-indicator.js" type="BINDATA" /> 181 <include name="IDR_PDF_VIEWER_PAGE_INDICATOR_JS" file="pdf/elements/view er-page-indicator/viewer-page-indicator.js" type="BINDATA" />
182 <include name="IDR_PDF_VIEWER_PASSWORD_SCREEN_CSS" file="pdf/html_office /elements/viewer-password-screen/viewer-password-screen.css" type="BINDATA" /> 182 <include name="IDR_PDF_VIEWER_PASSWORD_SCREEN_CSS" file="pdf/elements/vi ewer-password-screen/viewer-password-screen.css" type="BINDATA" />
183 <include name="IDR_PDF_VIEWER_PASSWORD_SCREEN_HTML" file="pdf/html_offic e/elements/viewer-password-screen/viewer-password-screen.html" type="BINDATA" /> 183 <include name="IDR_PDF_VIEWER_PASSWORD_SCREEN_HTML" file="pdf/elements/v iewer-password-screen/viewer-password-screen.html" type="BINDATA" />
184 <include name="IDR_PDF_VIEWER_PASSWORD_SCREEN_JS" file="pdf/html_office/ elements/viewer-password-screen/viewer-password-screen.js" type="BINDATA" /> 184 <include name="IDR_PDF_VIEWER_PASSWORD_SCREEN_JS" file="pdf/elements/vie wer-password-screen/viewer-password-screen.js" type="BINDATA" />
185 <include name="IDR_PDF_VIEWER_PROGRESS_BAR_CSS" file="pdf/html_office/el ements/viewer-progress-bar/viewer-progress-bar.css" type="BINDATA" /> 185 <include name="IDR_PDF_VIEWER_PROGRESS_BAR_CSS" file="pdf/elements/viewe r-progress-bar/viewer-progress-bar.css" type="BINDATA" />
186 <include name="IDR_PDF_VIEWER_PROGRESS_BAR_HTML" file="pdf/html_office/e lements/viewer-progress-bar/viewer-progress-bar.html" type="BINDATA" /> 186 <include name="IDR_PDF_VIEWER_PROGRESS_BAR_HTML" file="pdf/elements/view er-progress-bar/viewer-progress-bar.html" type="BINDATA" />
187 <include name="IDR_PDF_VIEWER_PROGRESS_BAR_JS" file="pdf/html_office/ele ments/viewer-progress-bar/viewer-progress-bar.js" type="BINDATA" /> 187 <include name="IDR_PDF_VIEWER_PROGRESS_BAR_JS" file="pdf/elements/viewer -progress-bar/viewer-progress-bar.js" type="BINDATA" />
188 <include name="IDR_PDF_VIEWER_TOOLBAR_CSS" file="pdf/html_office/element s/viewer-toolbar/viewer-toolbar.css" type="BINDATA" /> 188 <include name="IDR_PDF_VIEWER_TOOLBAR_CSS" file="pdf/elements/viewer-too lbar/viewer-toolbar.css" type="BINDATA" />
189 <include name="IDR_PDF_VIEWER_TOOLBAR_HTML" file="pdf/html_office/elemen ts/viewer-toolbar/viewer-toolbar.html" type="BINDATA" /> 189 <include name="IDR_PDF_VIEWER_TOOLBAR_HTML" file="pdf/elements/viewer-to olbar/viewer-toolbar.html" type="BINDATA" />
190 <include name="IDR_PDF_VIEWER_TOOLBAR_JS" file="pdf/html_office/elements /viewer-toolbar/viewer-toolbar.js" type="BINDATA" /> 190 <include name="IDR_PDF_VIEWER_TOOLBAR_JS" file="pdf/elements/viewer-tool bar/viewer-toolbar.js" type="BINDATA" />
191 191
192 <!-- Button images. --> 192 <!-- Button images. -->
193 <include name="IDR_PDF_BUTTON_LOW_1" file="pdf/html_office/elements/view er-button/img/lowDPI/button_fit_page.png" type="BINDATA" /> 193 <include name="IDR_PDF_BUTTON_LOW_1" file="pdf/elements/viewer-button/im g/lowDPI/button_fit_page.png" type="BINDATA" />
194 <include name="IDR_PDF_BUTTON_LOW_2" file="pdf/html_office/elements/view er-button/img/lowDPI/button_fit_width.png" type="BINDATA" /> 194 <include name="IDR_PDF_BUTTON_LOW_2" file="pdf/elements/viewer-button/im g/lowDPI/button_fit_width.png" type="BINDATA" />
195 <include name="IDR_PDF_BUTTON_LOW_3" file="pdf/html_office/elements/view er-button/img/lowDPI/button_zoom_out.png" type="BINDATA" /> 195 <include name="IDR_PDF_BUTTON_LOW_3" file="pdf/elements/viewer-button/im g/lowDPI/button_zoom_out.png" type="BINDATA" />
196 <include name="IDR_PDF_BUTTON_LOW_4" file="pdf/html_office/elements/view er-button/img/lowDPI/button_zoom_in.png" type="BINDATA" /> 196 <include name="IDR_PDF_BUTTON_LOW_4" file="pdf/elements/viewer-button/im g/lowDPI/button_zoom_in.png" type="BINDATA" />
197 <include name="IDR_PDF_BUTTON_LOW_5" file="pdf/html_office/elements/view er-button/img/lowDPI/button_save.png" type="BINDATA" /> 197 <include name="IDR_PDF_BUTTON_LOW_5" file="pdf/elements/viewer-button/im g/lowDPI/button_save.png" type="BINDATA" />
198 <include name="IDR_PDF_BUTTON_LOW_6" file="pdf/html_office/elements/view er-button/img/lowDPI/button_print.png" type="BINDATA" /> 198 <include name="IDR_PDF_BUTTON_LOW_6" file="pdf/elements/viewer-button/im g/lowDPI/button_print.png" type="BINDATA" />
199 <include name="IDR_PDF_BUTTON_HIGH_1" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_fit_page.png" type="BINDATA" /> 199 <include name="IDR_PDF_BUTTON_HIGH_1" file="pdf/elements/viewer-button/i mg/hiDPI/button_fit_page.png" type="BINDATA" />
200 <include name="IDR_PDF_BUTTON_HIGH_2" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_fit_width.png" type="BINDATA" /> 200 <include name="IDR_PDF_BUTTON_HIGH_2" file="pdf/elements/viewer-button/i mg/hiDPI/button_fit_width.png" type="BINDATA" />
201 <include name="IDR_PDF_BUTTON_HIGH_3" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_zoom_out.png" type="BINDATA" /> 201 <include name="IDR_PDF_BUTTON_HIGH_3" file="pdf/elements/viewer-button/i mg/hiDPI/button_zoom_out.png" type="BINDATA" />
202 <include name="IDR_PDF_BUTTON_HIGH_4" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_zoom_in.png" type="BINDATA" /> 202 <include name="IDR_PDF_BUTTON_HIGH_4" file="pdf/elements/viewer-button/i mg/hiDPI/button_zoom_in.png" type="BINDATA" />
203 <include name="IDR_PDF_BUTTON_HIGH_5" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_save.png" type="BINDATA" /> 203 <include name="IDR_PDF_BUTTON_HIGH_5" file="pdf/elements/viewer-button/i mg/hiDPI/button_save.png" type="BINDATA" />
204 <include name="IDR_PDF_BUTTON_HIGH_6" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_print.png" type="BINDATA" /> 204 <include name="IDR_PDF_BUTTON_HIGH_6" file="pdf/elements/viewer-button/i mg/hiDPI/button_print.png" type="BINDATA" />
205 </if> 205 </if>
206 <include name="IDR_CRYPTOTOKEN_UTIL_JS" file="cryptotoken/util.js" type="B INDATA" /> 206 <include name="IDR_CRYPTOTOKEN_UTIL_JS" file="cryptotoken/util.js" type="B INDATA" />
207 <include name="IDR_CRYPTOTOKEN_B64_JS" file="cryptotoken/b64.js" type="BIN DATA" /> 207 <include name="IDR_CRYPTOTOKEN_B64_JS" file="cryptotoken/b64.js" type="BIN DATA" />
208 <include name="IDR_CRYPTOTOKEN_CLOSEABLE_JS" file="cryptotoken/closeable.j s" type="BINDATA" /> 208 <include name="IDR_CRYPTOTOKEN_CLOSEABLE_JS" file="cryptotoken/closeable.j s" type="BINDATA" />
209 <include name="IDR_CRYPTOTOKEN_COUNTDOWN_JS" file="cryptotoken/countdown.j s" type="BINDATA" /> 209 <include name="IDR_CRYPTOTOKEN_COUNTDOWN_JS" file="cryptotoken/countdown.j s" type="BINDATA" />
210 <include name="IDR_CRYPTOTOKEN_COUNTDOWNTIMER_JS" file="cryptotoken/countd owntimer.js" type="BINDATA" /> 210 <include name="IDR_CRYPTOTOKEN_COUNTDOWNTIMER_JS" file="cryptotoken/countd owntimer.js" type="BINDATA" />
211 <include name="IDR_CRYPTOTOKEN_SHA256_JS" file="cryptotoken/sha256.js" typ e="BINDATA" /> 211 <include name="IDR_CRYPTOTOKEN_SHA256_JS" file="cryptotoken/sha256.js" typ e="BINDATA" />
212 <include name="IDR_CRYPTOTOKEN_HIDGNUBBYDEVICE_JS" file="cryptotoken/hidgn ubbydevice.js" type="BINDATA" /> 212 <include name="IDR_CRYPTOTOKEN_HIDGNUBBYDEVICE_JS" file="cryptotoken/hidgn ubbydevice.js" type="BINDATA" />
213 <include name="IDR_CRYPTOTOKEN_USBGNUBBYDEVICE_JS" file="cryptotoken/usbgn ubbydevice.js" type="BINDATA" /> 213 <include name="IDR_CRYPTOTOKEN_USBGNUBBYDEVICE_JS" file="cryptotoken/usbgn ubbydevice.js" type="BINDATA" />
214 <include name="IDR_CRYPTOTOKEN_GNUBBIES_JS" file="cryptotoken/gnubbies.js" type="BINDATA" /> 214 <include name="IDR_CRYPTOTOKEN_GNUBBIES_JS" file="cryptotoken/gnubbies.js" type="BINDATA" />
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 <!-- The next two files have a .png extension since grit for some reason 256 <!-- 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 257 won't compile these files in if they are named .nmf/.pexe or
258 anything remotely similar to their actual extension. Naming these 258 anything remotely similar to their actual extension. Naming these
259 .js or .html breaks all kinds of presubmit checks, hence .png seems 259 .js or .html breaks all kinds of presubmit checks, hence .png seems
260 to be the only viable option at the moment. --> 260 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" /> 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_PEXE" file="whi spernet_proxy/whispernet_proxy_pnacl.pexe.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 </includes> 263 </includes>
264 </release> 264 </release>
265 </grit> 265 </grit>
OLDNEW
« no previous file with comments | « DEPS ('k') | chrome/browser/resources/pdf/elements/viewer-button/img/hiDPI/button_fit_page.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698