Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 248 <include name="IDR_POLICY_CSS" file="resources\policy_android.css" type= "BINDATA"/> | 248 <include name="IDR_POLICY_CSS" file="resources\policy_android.css" type= "BINDATA"/> |
| 249 </if> | 249 </if> |
| 250 <if expr="not is_android"> | 250 <if expr="not is_android"> |
| 251 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA "/> | 251 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA "/> |
| 252 </if> | 252 </if> |
| 253 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/> | 253 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/> |
| 254 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/> | 254 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/> |
| 255 <include name="IDR_PRERENDER_URL_WHITELIST" file="resources\prerender_url_ whitelist.dat" type="BINDATA"/> | 255 <include name="IDR_PRERENDER_URL_WHITELIST" file="resources\prerender_url_ whitelist.dat" type="BINDATA"/> |
| 256 <if expr="enable_print_preview"> | 256 <if expr="enable_print_preview"> |
| 257 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\pri nt_preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> | 257 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\pri nt_preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> |
| 258 <include name="IDR_PRINT_PREVIEW_PAGE" file="resources\print_preview\pri nt_preview_page.html" flattenhtml="true" allowexternalscript="false" type="BINDA TA" /> | |
|
Lei Zhang
2015/01/09 22:02:42
Why is only this resource file being moved?
Vitaly Buka (NO REVIEWS)
2015/01/09 23:29:48
this change moves only renderer part of printing.
| |
| 259 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print _preview.js" flattenhtml="true" type="BINDATA" /> | 258 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print _preview.js" flattenhtml="true" type="BINDATA" /> |
| 260 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER" | 259 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER" |
| 261 file="resources\print_preview\images\printer.png" type="BINDATA " /> | 260 file="resources\print_preview\images\printer.png" type="BINDATA " /> |
| 262 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER_SHARED" | 261 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER_SHARED" |
| 263 file="resources\print_preview\images\printer_shared.png" type=" BINDATA" /> | 262 file="resources\print_preview\images\printer_shared.png" type=" BINDATA" /> |
| 264 <include name="IDR_PRINT_PREVIEW_IMAGES_GOOGLE_DOC" | 263 <include name="IDR_PRINT_PREVIEW_IMAGES_GOOGLE_DOC" |
| 265 file="resources\print_preview\images\google_doc.png" type="BIND ATA" /> | 264 file="resources\print_preview\images\google_doc.png" type="BIND ATA" /> |
| 266 <include name="IDR_PRINT_PREVIEW_IMAGES_PDF" | 265 <include name="IDR_PRINT_PREVIEW_IMAGES_PDF" |
| 267 file="resources\print_preview\images\pdf.png" type="BINDATA" /> | 266 file="resources\print_preview\images\pdf.png" type="BINDATA" /> |
| 268 <include name="IDR_PRINT_PREVIEW_IMAGES_THIRD_PARTY" | 267 <include name="IDR_PRINT_PREVIEW_IMAGES_THIRD_PARTY" |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 337 <include name="IDR_ECHO_MANIFEST" file="resources\chromeos\echo\manifest .json" type="BINDATA" /> | 336 <include name="IDR_ECHO_MANIFEST" file="resources\chromeos\echo\manifest .json" type="BINDATA" /> |
| 338 <include name="IDR_OFFLINE_APP_LOAD_HTML" file="resources\chromeos\offli ne_app_load.html" flattenhtml="true" type="BINDATA" /> | 337 <include name="IDR_OFFLINE_APP_LOAD_HTML" file="resources\chromeos\offli ne_app_load.html" flattenhtml="true" type="BINDATA" /> |
| 339 <include name="IDR_OFFLINE_NET_LOAD_HTML" file="resources\chromeos\offli ne_net_load.html" flattenhtml="true" type="BINDATA" /> | 338 <include name="IDR_OFFLINE_NET_LOAD_HTML" file="resources\chromeos\offli ne_net_load.html" flattenhtml="true" type="BINDATA" /> |
| 340 <include name="IDR_MERGE_SESSION_LOAD_HTML" file="resources\chromeos\mer ge_session_load.html" flattenhtml="true" type="BINDATA" /> | 339 <include name="IDR_MERGE_SESSION_LOAD_HTML" file="resources\chromeos\mer ge_session_load.html" flattenhtml="true" type="BINDATA" /> |
| 341 <include name="IDR_OS_CREDITS_HTML" file="resources\chromeos\about_os_cr edits.html" flattenhtml="true" type="BINDATA" /> | 340 <include name="IDR_OS_CREDITS_HTML" file="resources\chromeos\about_os_cr edits.html" flattenhtml="true" type="BINDATA" /> |
| 342 <include name="IDR_PROXY_SETTINGS_HTML" file="resources\chromeos\proxy_s ettings.html" flattenhtml="true" type="BINDATA" /> | 341 <include name="IDR_PROXY_SETTINGS_HTML" file="resources\chromeos\proxy_s ettings.html" flattenhtml="true" type="BINDATA" /> |
| 343 <include name="IDR_CERT_MANAGER_DIALOG_HTML" file="resources\chromeos\ce rtificate_manager_dialog.html" flattenhtml="true" type="BINDATA" /> | 342 <include name="IDR_CERT_MANAGER_DIALOG_HTML" file="resources\chromeos\ce rtificate_manager_dialog.html" flattenhtml="true" type="BINDATA" /> |
| 344 <include name="IDR_BLUETOOTH_PAIR_DEVICE_HTML" file="resources\chromeos\ bluetooth_pair_device.html" flattenhtml="true" type="BINDATA" /> | 343 <include name="IDR_BLUETOOTH_PAIR_DEVICE_HTML" file="resources\chromeos\ bluetooth_pair_device.html" flattenhtml="true" type="BINDATA" /> |
| 345 <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock. html" flattenhtml="true" type="BINDATA" /> | 344 <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock. html" flattenhtml="true" type="BINDATA" /> |
| 346 <include name="IDR_SLOW_HTML" file="resources\chromeos\slow.html" flatte nhtml="true" type="BINDATA" /> | 345 <include name="IDR_SLOW_HTML" file="resources\chromeos\slow.html" flatte nhtml="true" type="BINDATA" /> |
| 347 <include name="IDR_SLOW_JS" file="resources\chromeos\slow.js" type="BIND ATA" /> | 346 <include name="IDR_SLOW_JS" file="resources\chromeos\slow.js" type="BIND ATA" /> |
| 348 </if> | 347 </if> |
| 349 <if expr="chromeos"> | 348 <if expr="chromeos"> |
| 350 <include name="IDR_DEMO_APP_MANIFEST" file="resources\chromeos\demo_app\ manifest.json" type="BINDATA" /> | 349 <include name="IDR_DEMO_APP_MANIFEST" file="resources\chromeos\demo_app\ manifest.json" type="BINDATA" /> |
| 351 <include name="IDR_WALLPAPERMANAGER_MANIFEST" file="resources\chromeos\w allpaper_manager\manifest.json" type="BINDATA" /> | 350 <include name="IDR_WALLPAPERMANAGER_MANIFEST" file="resources\chromeos\w allpaper_manager\manifest.json" type="BINDATA" /> |
| 352 <include name="IDR_FIRST_RUN_DIALOG_MANIFEST" file="resources\chromeos\f irst_run\app/manifest.json" type="BINDATA" /> | 351 <include name="IDR_FIRST_RUN_DIALOG_MANIFEST" file="resources\chromeos\f irst_run\app/manifest.json" type="BINDATA" /> |
| 353 </if> | 352 </if> |
| 354 <if expr="chromeos"> | 353 <if expr="chromeos"> |
| 355 <include name="IDR_NETWORK_CONFIGURATION_MANIFEST" file="resources\chrom eos\network_configuration\manifest.json" type="BINDATA" /> | 354 <include name="IDR_NETWORK_CONFIGURATION_MANIFEST" file="resources\chrom eos\network_configuration\manifest.json" type="BINDATA" /> |
| 356 </if> | 355 </if> |
| 357 <if expr="chromeos and _google_chrome"> | 356 <if expr="chromeos and _google_chrome"> |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 445 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" /> | 444 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" /> |
| 446 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" /> | 445 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" /> |
| 447 </if> | 446 </if> |
| 448 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" /> | 447 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" /> |
| 449 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> | 448 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> |
| 450 </if> | 449 </if> |
| 451 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> | 450 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> |
| 452 </includes> | 451 </includes> |
| 453 </release> | 452 </release> |
| 454 </grit> | 453 </grit> |
| OLD | NEW |