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

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

Issue 1065773002: Move Media Router resource files into .grdp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/media_router_resources.grdp » ('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 <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 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 <include name="IDR_ZHUYIN_MANIFEST" file="resources\chromeos\input_met hod\zhuyin_manifest.json" type="BINDATA" /> 441 <include name="IDR_ZHUYIN_MANIFEST" file="resources\chromeos\input_met hod\zhuyin_manifest.json" type="BINDATA" />
442 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" /> 442 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" />
443 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" /> 443 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" />
444 </if> 444 </if>
445 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" /> 445 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" />
446 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> 446 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />
447 </if> 447 </if>
448 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 448 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
449 <include name="IDR_MD_SETTINGS_UI_HTML" file="resources\md_settings\md_set tings.html" type="BINDATA" /> 449 <include name="IDR_MD_SETTINGS_UI_HTML" file="resources\md_settings\md_set tings.html" type="BINDATA" />
450 <include name="IDR_MD_SETTINGS_UI_CSS" file="resources\md_settings\md_sett ings.css" type="BINDATA" /> 450 <include name="IDR_MD_SETTINGS_UI_CSS" file="resources\md_settings\md_sett ings.css" type="BINDATA" />
451 <if expr="enable_media_router"> 451 <part file="media_router_resources.grdp" />
James Hawkins 2015/04/07 15:18:17 This should be behind the <if>, right?
apacible 2015/04/07 15:31:09 I followed the components_resources.grd style, sin
James Hawkins 2015/04/07 15:33:48 OK; I don't think that was done correctly. If we
apacible 2015/04/07 15:37:31 I see. I've moved the <if> out of the .grdp and in
452 <include name="IDR_MEDIA_ROUTER_DATA_JS" file="resources\media_router\me dia_router_data.js" type="BINDATA" />
453 <include name="IDR_CAST_MODE_PICKER_HTML" file="resources\media_router\e lements\cast_mode_picker\cast_mode_picker.html" type="BINDATA" />
454 <include name="IDR_CAST_MODE_PICKER_CSS" file="resources\media_router\el ements\cast_mode_picker\cast_mode_picker.css" type="BINDATA" />
455 <include name="IDR_CAST_MODE_PICKER_JS" file="resources\media_router\ele ments\cast_mode_picker\cast_mode_picker.js" type="BINDATA" />
456 <include name="IDR_ISSUE_BANNER_HTML" file="resources\media_router\eleme nts\issue_banner\issue_banner.html" type="BINDATA" />
457 <include name="IDR_ISSUE_BANNER_JS" file="resources\media_router\element s\issue_banner\issue_banner.js" type="BINDATA" />
458 <include name="IDR_ISSUE_BANNER_CSS" file="resources\media_router\elemen ts\issue_banner\issue_banner.css" type="BINDATA" />
459 <include name="IDR_MEDIA_ROUTER_CHROMECAST_ICON" file="resources\media_r outer\elements\icon\chromecast-icon.png" type="BINDATA" />
460 <include name="IDR_MEDIA_ROUTER_CHROMECAST_2X_ICON" file="resources\medi a_router\elements\icon\chromecast-icon2x.png" type="BINDATA" />
461 <include name="IDR_CLOSE_GRAY_ICON" file="resources\media_router\element s\icon\close-gray.png" type="BINDATA" />
462 <include name="IDR_CLOSE_GRAY_2X_ICON" file="resources\media_router\elem ents\icon\close-gray2x.png" type="BINDATA" />
463 <include name="IDR_DROP_DOWN_ARROW_ICON" file="resources\media_router\el ements\icon\drop-down-arrow.png" type="BINDATA" />
464 <include name="IDR_DROP_DOWN_ARROW_2X_ICON" file="resources\media_router \elements\icon\drop-down-arrow2x.png" type="BINDATA" />
465 <include name="IDR_DROP_DOWN_ARROW_HOVER_ICON" file="resources\media_rou ter\elements\icon\drop-down-arrow-hover.png" type="BINDATA" />
466 <include name="IDR_DROP_DOWN_ARROW_HOVER_2X_ICON" file="resources\media_ router\elements\icon\drop-down-arrow-hover2x.png" type="BINDATA" />
467 <include name="IDR_DROP_DOWN_ARROW_SHOWING_ICON" file="resources\media_r outer\elements\icon\drop-down-arrow-showing.png" type="BINDATA" />
468 <include name="IDR_DROP_DOWN_ARROW_SHOWING_2X_ICON" file="resources\medi a_router\elements\icon\drop-down-arrow-showing2x.png" type="BINDATA" />
469 <include name="IDR_MEDIA_ROUTER_GENERIC_DEVICE_ICON" file="resources\med ia_router\elements\icon\generic-device.png" type="BINDATA" />
470 <include name="IDR_MEDIA_ROUTER_GENERIC_DEVICE_2X_ICON" file="resources\ media_router\elements\icon\generic-device2x.png" type="BINDATA" />
471 <include name="IDR_MEDIA_ROUTER_HANGOUTS_ICON" file="resources\media_rou ter\elements\icon\hangouts-icon.png" type="BINDATA" />
472 <include name="IDR_MEDIA_ROUTER_HANGOUTS_2X_ICON" file="resources\media_ router\elements\icon\hangouts-icon2x.png" type="BINDATA" />
473 <include name="IDR_SAD_FACE_ICON" file="resources\media_router\elements\ icon\sad-face.png" type="BINDATA" />
474 <include name="IDR_SAD_FACE_2X_ICON" file="resources\media_router\elemen ts\icon\sad-face2x.png" type="BINDATA" />
475 </if>
476 </includes> 452 </includes>
477 </release> 453 </release>
478 </grit> 454 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media_router_resources.grdp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698