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

Side by Side Diff: chrome/browser/browser_resources.grd

Issue 1217503012: Avoid cross-origin iframe issues when loading PDF in print preview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/browser_resources.h" type="rc_header"> 4 <output filename="grit/browser_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="browser_resources.pak" type="data_package" /> 7 <output filename="browser_resources.pak" type="data_package" />
8 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <structures> 10 <structures>
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 <include name="IDR_POLICY_CSS" file="resources\policy_android.css" type= "BINDATA"/> 274 <include name="IDR_POLICY_CSS" file="resources\policy_android.css" type= "BINDATA"/>
275 </if> 275 </if>
276 <if expr="not is_android"> 276 <if expr="not is_android">
277 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA "/> 277 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA "/>
278 </if> 278 </if>
279 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/> 279 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/>
280 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/> 280 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/>
281 <if expr="enable_print_preview"> 281 <if expr="enable_print_preview">
282 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\pri nt_preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 282 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\pri nt_preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
283 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print _preview.js" flattenhtml="true" type="BINDATA" /> 283 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print _preview.js" flattenhtml="true" type="BINDATA" />
284 <include name="IDR_PRINT_PREVIEW_PDF_PREVIEW_HTML" file="resources\print _preview\pdf_preview.html" flattenhtml="true" allowexternalscript="true" type="B INDATA" />
284 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER" 285 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER"
285 file="resources\print_preview\images\printer.png" type="BINDATA " /> 286 file="resources\print_preview\images\printer.png" type="BINDATA " />
286 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER_SHARED" 287 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER_SHARED"
287 file="resources\print_preview\images\printer_shared.png" type=" BINDATA" /> 288 file="resources\print_preview\images\printer_shared.png" type=" BINDATA" />
288 <include name="IDR_PRINT_PREVIEW_IMAGES_GOOGLE_DOC" 289 <include name="IDR_PRINT_PREVIEW_IMAGES_GOOGLE_DOC"
289 file="resources\print_preview\images\google_doc.png" type="BIND ATA" /> 290 file="resources\print_preview\images\google_doc.png" type="BIND ATA" />
290 <include name="IDR_PRINT_PREVIEW_IMAGES_PDF" 291 <include name="IDR_PRINT_PREVIEW_IMAGES_PDF"
291 file="resources\print_preview\images\pdf.png" type="BINDATA" /> 292 file="resources\print_preview\images\pdf.png" type="BINDATA" />
292 <include name="IDR_PRINT_PREVIEW_IMAGES_THIRD_PARTY" 293 <include name="IDR_PRINT_PREVIEW_IMAGES_THIRD_PARTY"
293 file="resources\print_preview\images\third_party.png" type="BIN DATA" /> 294 file="resources\print_preview\images\third_party.png" type="BIN DATA" />
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 </if> 465 </if>
465 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> 466 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />
466 </if> 467 </if>
467 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 468 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
468 <if expr="enable_media_router"> 469 <if expr="enable_media_router">
469 <part file="media_router_resources.grdp" /> 470 <part file="media_router_resources.grdp" />
470 </if> 471 </if>
471 </includes> 472 </includes>
472 </release> 473 </release>
473 </grit> 474 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/pdf/index-material.html » ('j') | content/browser/webui/web_ui_data_source_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698