| OLD | NEW |
| 1 <?xml version="1.0" encoding="UTF-8"?> | 1 <?xml version="1.0" encoding="UTF-8"?> |
| 2 <!-- This comment is only here because changes to resources are not picked up | 2 <!-- This comment is only here because changes to resources are not picked up |
| 3 without changes to the corresponding grd file. eter --> | 3 without changes to the corresponding grd file. eter --> |
| 4 <grit latest_public_release="0" current_release="1"> | 4 <grit latest_public_release="0" current_release="1"> |
| 5 <outputs> | 5 <outputs> |
| 6 <output filename="grit/browser_resources.h" type="rc_header"> | 6 <output filename="grit/browser_resources.h" type="rc_header"> |
| 7 <emit emit_type='prepend'></emit> | 7 <emit emit_type='prepend'></emit> |
| 8 </output> | 8 </output> |
| 9 <output filename="browser_resources.pak" type="data_package" /> | 9 <output filename="browser_resources.pak" type="data_package" /> |
| 10 <output filename="browser_resources.rc" type="rc_all" /> | 10 <output filename="browser_resources.rc" type="rc_all" /> |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2
line.html" flattenhtml="true" type="BINDATA" /> | 46 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2
line.html" flattenhtml="true" type="BINDATA" /> |
| 47 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic
on.html" type="BINDATA" /> | 47 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic
on.html" type="BINDATA" /> |
| 48 <include name="IDR_OPTIONS_HTML" file="resources\options.html" flattenhtml
="true" type="BINDATA" /> | 48 <include name="IDR_OPTIONS_HTML" file="resources\options.html" flattenhtml
="true" type="BINDATA" /> |
| 49 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml
="true" type="BINDATA" /> | 49 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml
="true" type="BINDATA" /> |
| 50 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview.html"
flattenhtml="true" type="BINDATA" /> | 50 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview.html"
flattenhtml="true" type="BINDATA" /> |
| 51 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows
ing_malware_block.html" flattenhtml="true" type="BINDATA" /> | 51 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows
ing_malware_block.html" flattenhtml="true" type="BINDATA" /> |
| 52 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa
fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" /> | 52 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa
fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" /> |
| 53 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow
sing_phishing_block.html" flattenhtml="true" type="BINDATA" /> | 53 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow
sing_phishing_block.html" flattenhtml="true" type="BINDATA" /> |
| 54 <include name="IDR_SSL_ERROR_HTML" file="security\resources\ssl_error.html
" flattenhtml="true" type="BINDATA" /> | 54 <include name="IDR_SSL_ERROR_HTML" file="security\resources\ssl_error.html
" flattenhtml="true" type="BINDATA" /> |
| 55 <include name="IDR_SSL_ROAD_BLOCK_HTML" file="security\resources\ssl_roadb
lock.html" flattenhtml="true" type="BINDATA" /> | 55 <include name="IDR_SSL_ROAD_BLOCK_HTML" file="security\resources\ssl_roadb
lock.html" flattenhtml="true" type="BINDATA" /> |
| 56 <include name="IDR_SYNC_CHOOSE_DATATYPES_HTML" file="sync\resources\choose
_datatypes.html" flattenhtml="true" type="BINDATA" /> | 56 <include name="IDR_SYNC_CONFIGURE_HTML" file="sync\resources\configure.htm
l" flattenhtml="true" type="BINDATA" /> |
| 57 <include name="IDR_SYNC_PASSPHRASE_HTML" file="sync\resources\passphrase.h
tml" flattenhtml="true" type="BINDATA" /> |
| 58 <include name="IDR_SYNC_SETTING_UP_HTML" file="sync\resources\setting_up.h
tml" flattenhtml="true" type="BINDATA" /> |
| 57 <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.h
tml" flattenhtml="true" type="BINDATA" /> | 59 <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.h
tml" flattenhtml="true" type="BINDATA" /> |
| 58 <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.h
tml" flattenhtml="true" type="BINDATA" /> | 60 <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.h
tml" flattenhtml="true" type="BINDATA" /> |
| 59 <include name="IDR_REMOTING_SETUP_FLOW_HTML" file="remoting\resources\remo
ting_setup_flow.html" flattenhtml="true" type="BINDATA" /> | 61 <include name="IDR_REMOTING_SETUP_FLOW_HTML" file="remoting\resources\remo
ting_setup_flow.html" flattenhtml="true" type="BINDATA" /> |
| 60 <include name="IDR_REMOTING_SETUP_DONE_HTML" file="remoting\resources\remo
ting_setup_done.html" flattenhtml="true" type="BINDATA" /> | 62 <include name="IDR_REMOTING_SETUP_DONE_HTML" file="remoting\resources\remo
ting_setup_done.html" flattenhtml="true" type="BINDATA" /> |
| 61 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA
TA" /> | 63 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA
TA" /> |
| 62 <include name="IDR_BUGREPORT_HTML" file="resources\bug_report.html" flatte
nhtml="true" type="BINDATA" /> | 64 <include name="IDR_BUGREPORT_HTML" file="resources\bug_report.html" flatte
nhtml="true" type="BINDATA" /> |
| 63 <include name="IDR_BUGREPORT_HTML_INVALID" file="resources\bug_report_inva
lid.html" flattenhtml="true" type="BINDATA" /> | 65 <include name="IDR_BUGREPORT_HTML_INVALID" file="resources\bug_report_inva
lid.html" flattenhtml="true" type="BINDATA" /> |
| 64 <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifes
t.json" type="BINDATA" /> | 66 <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifes
t.json" type="BINDATA" /> |
| 65 <if expr="pp_ifdef('chromeos')"> | 67 <if expr="pp_ifdef('chromeos')"> |
| 66 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flatt
enhtml="true" type="BINDATA" /> | 68 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flatt
enhtml="true" type="BINDATA" /> |
| 67 <include name="IDR_FILEBROWSE_HTML" file="resources\filebrowse.html" fla
ttenhtml="true" type="BINDATA" /> | 69 <include name="IDR_FILEBROWSE_HTML" file="resources\filebrowse.html" fla
ttenhtml="true" type="BINDATA" /> |
| 68 <include name="IDR_HOST_REGISTRATION_PAGE_HTML" file="resources\host_reg
istration_page.html" flattenhtml="true" type="BINDATA" /> | 70 <include name="IDR_HOST_REGISTRATION_PAGE_HTML" file="resources\host_reg
istration_page.html" flattenhtml="true" type="BINDATA" /> |
| 69 <include name="IDR_IMAGEBURNER_HTML" file="resources\imageburner.html" f
lattenhtml="true" type="BINDATA" /> | 71 <include name="IDR_IMAGEBURNER_HTML" file="resources\imageburner.html" f
lattenhtml="true" type="BINDATA" /> |
| 70 <include name="IDR_MEDIAPLAYER_HTML" file="resources\mediaplayer.html" f
lattenhtml="true" type="BINDATA" /> | 72 <include name="IDR_MEDIAPLAYER_HTML" file="resources\mediaplayer.html" f
lattenhtml="true" type="BINDATA" /> |
| 71 <include name="IDR_MEDIAPLAYERPLAYLIST_HTML" file="resources\playlist.ht
ml" flattenhtml="true" type="BINDATA" /> | 73 <include name="IDR_MEDIAPLAYERPLAYLIST_HTML" file="resources\playlist.ht
ml" flattenhtml="true" type="BINDATA" /> |
| 72 <include name="IDR_MOBILE_SETUP_PAGE_HTML" file="resources\mobile_setup.
html" flattenhtml="true" type="BINDATA" /> | 74 <include name="IDR_MOBILE_SETUP_PAGE_HTML" file="resources\mobile_setup.
html" flattenhtml="true" type="BINDATA" /> |
| 73 <include name="IDR_OFFLINE_LOAD_HTML" file="resources\offline_load.html"
flattenhtml="true" type="BINDATA" /> | 75 <include name="IDR_OFFLINE_LOAD_HTML" file="resources\offline_load.html"
flattenhtml="true" type="BINDATA" /> |
| 74 <include name="IDR_OS_CREDITS_HTML" file="resources\about_os_credits.htm
l" flattenhtml="true" type="BINDATA" /> | 76 <include name="IDR_OS_CREDITS_HTML" file="resources\about_os_credits.htm
l" flattenhtml="true" type="BINDATA" /> |
| 75 <include name="IDR_SLIDESHOW_HTML" file="resources\slideshow.html" flatt
enhtml="true" type="BINDATA" /> | 77 <include name="IDR_SLIDESHOW_HTML" file="resources\slideshow.html" flatt
enhtml="true" type="BINDATA" /> |
| 76 <include name="IDR_TALK_APP_MANIFEST" file="resources\chat_manager\manif
est.json" type="BINDATA" /> | 78 <include name="IDR_TALK_APP_MANIFEST" file="resources\chat_manager\manif
est.json" type="BINDATA" /> |
| 77 <include name="IDR_MENU_HTML" file="resources\menu.html" flattenhtml="tr
ue" type="BINDATA" /> | 79 <include name="IDR_MENU_HTML" file="resources\menu.html" flattenhtml="tr
ue" type="BINDATA" /> |
| 78 <include name="IDR_WRENCH_MENU_JS" file="resources\wrench_menu.js" flatt
enhtml="true" type="BINDATA" /> | 80 <include name="IDR_WRENCH_MENU_JS" file="resources\wrench_menu.js" flatt
enhtml="true" type="BINDATA" /> |
| 79 </if> | 81 </if> |
| 80 </includes> | 82 </includes> |
| 81 </release> | 83 </release> |
| 82 </grit> | 84 </grit> |
| OLD | NEW |