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

Issues Search
    My Issues | Starred     Open | Closed | All

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, 5 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') | chrome/browser/resources/pdf/manifest.json » ('J')
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 <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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 <include name="IDR_POLICY_CSS" file="resources\policy_android.css" type= "BINDATA"/> 233 <include name="IDR_POLICY_CSS" file="resources\policy_android.css" type= "BINDATA"/>
234 </if> 234 </if>
235 <if expr="not is_android"> 235 <if expr="not is_android">
236 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA "/> 236 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA "/>
237 </if> 237 </if>
238 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/> 238 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/>
239 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/> 239 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/>
240 <if expr="enable_print_preview"> 240 <if expr="enable_print_preview">
241 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\pri nt_preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 241 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\pri nt_preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
242 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print _preview.js" flattenhtml="true" type="BINDATA" /> 242 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print _preview.js" flattenhtml="true" type="BINDATA" />
243 <include name="IDR_PRINT_PREVIEW_PDF_PREVIEW_HTML" file="resources\print _preview\pdf_preview.html" flattenhtml="true" allowexternalscript="true" type="B INDATA" />
243 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER" 244 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER"
244 file="resources\print_preview\images\printer.png" type="BINDATA " /> 245 file="resources\print_preview\images\printer.png" type="BINDATA " />
245 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER_SHARED" 246 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER_SHARED"
246 file="resources\print_preview\images\printer_shared.png" type=" BINDATA" /> 247 file="resources\print_preview\images\printer_shared.png" type=" BINDATA" />
247 <include name="IDR_PRINT_PREVIEW_IMAGES_GOOGLE_DOC" 248 <include name="IDR_PRINT_PREVIEW_IMAGES_GOOGLE_DOC"
248 file="resources\print_preview\images\google_doc.png" type="BIND ATA" /> 249 file="resources\print_preview\images\google_doc.png" type="BIND ATA" />
249 <include name="IDR_PRINT_PREVIEW_IMAGES_PDF" 250 <include name="IDR_PRINT_PREVIEW_IMAGES_PDF"
250 file="resources\print_preview\images\pdf.png" type="BINDATA" /> 251 file="resources\print_preview\images\pdf.png" type="BINDATA" />
251 <include name="IDR_PRINT_PREVIEW_IMAGES_THIRD_PARTY" 252 <include name="IDR_PRINT_PREVIEW_IMAGES_THIRD_PARTY"
252 file="resources\print_preview\images\third_party.png" type="BIN DATA" /> 253 file="resources\print_preview\images\third_party.png" type="BIN DATA" />
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 </if> 424 </if>
424 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 425 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
425 <include name="IDR_MD_SETTINGS_UI_HTML" file="resources\md_settings\md_set tings.html" type="BINDATA" /> 426 <include name="IDR_MD_SETTINGS_UI_HTML" file="resources\md_settings\md_set tings.html" type="BINDATA" />
426 <include name="IDR_MD_SETTINGS_UI_CSS" file="resources\md_settings\md_sett ings.css" type="BINDATA" /> 427 <include name="IDR_MD_SETTINGS_UI_CSS" file="resources\md_settings\md_sett ings.css" type="BINDATA" />
427 <if expr="enable_media_router"> 428 <if expr="enable_media_router">
428 <part file="media_router_resources.grdp" /> 429 <part file="media_router_resources.grdp" />
429 </if> 430 </if>
430 </includes> 431 </includes>
431 </release> 432 </release>
432 </grit> 433 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/pdf/index.html » ('j') | chrome/browser/resources/pdf/manifest.json » ('J')

Powered by Google App Engine
This is Rietveld 408576698