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

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 4 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
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 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 <include name="IDR_POLICY_CSS" file="resources\policy_android.css" type= "BINDATA"/> 286 <include name="IDR_POLICY_CSS" file="resources\policy_android.css" type= "BINDATA"/>
287 </if> 287 </if>
288 <if expr="not is_android"> 288 <if expr="not is_android">
289 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA "/> 289 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA "/>
290 </if> 290 </if>
291 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/> 291 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/>
292 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/> 292 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/>
293 <if expr="enable_print_preview"> 293 <if expr="enable_print_preview">
294 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\pri nt_preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 294 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\pri nt_preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
295 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print _preview.js" flattenhtml="true" type="BINDATA" /> 295 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print _preview.js" flattenhtml="true" type="BINDATA" />
296 <include name="IDR_PRINT_PREVIEW_PDF_PREVIEW_HTML" file="resources\print _preview\pdf_preview.html" flattenhtml="true" allowexternalscript="true" type="B INDATA" />
296 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER" 297 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER"
297 file="resources\print_preview\images\printer.png" type="BINDATA " /> 298 file="resources\print_preview\images\printer.png" type="BINDATA " />
298 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER_SHARED" 299 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER_SHARED"
299 file="resources\print_preview\images\printer_shared.png" type=" BINDATA" /> 300 file="resources\print_preview\images\printer_shared.png" type=" BINDATA" />
300 <include name="IDR_PRINT_PREVIEW_IMAGES_GOOGLE_DOC" 301 <include name="IDR_PRINT_PREVIEW_IMAGES_GOOGLE_DOC"
301 file="resources\print_preview\images\google_doc.png" type="BIND ATA" /> 302 file="resources\print_preview\images\google_doc.png" type="BIND ATA" />
302 <include name="IDR_PRINT_PREVIEW_IMAGES_PDF" 303 <include name="IDR_PRINT_PREVIEW_IMAGES_PDF"
303 file="resources\print_preview\images\pdf.png" type="BINDATA" /> 304 file="resources\print_preview\images\pdf.png" type="BINDATA" />
304 <include name="IDR_PRINT_PREVIEW_IMAGES_THIRD_PARTY" 305 <include name="IDR_PRINT_PREVIEW_IMAGES_THIRD_PARTY"
305 file="resources\print_preview\images\third_party.png" type="BIN DATA" /> 306 file="resources\print_preview\images\third_party.png" type="BIN DATA" />
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 </if> 477 </if>
477 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> 478 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />
478 </if> 479 </if>
479 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 480 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
480 <if expr="enable_media_router"> 481 <if expr="enable_media_router">
481 <part file="media_router_resources.grdp" /> 482 <part file="media_router_resources.grdp" />
482 </if> 483 </if>
483 </includes> 484 </includes>
484 </release> 485 </release>
485 </grit> 486 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/pdf/index.html » ('j') | content/browser/webui/web_ui_data_source_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698