| 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> |
| 11 <if expr="not is_win and not is_macosx and not is_ios"> | 11 <if expr="not is_win and not is_macosx and not is_ios"> |
| 12 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_lin
ux.html" flattenhtml="true" type="chrome_html" /> | 12 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_lin
ux.html" flattenhtml="true" type="chrome_html" /> |
| 13 </if> | 13 </if> |
| 14 <if expr="is_macosx or is_ios"> | 14 <if expr="is_macosx or is_ios"> |
| 15 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac
.html" flattenhtml="true" type="chrome_html" /> | 15 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac
.html" flattenhtml="true" type="chrome_html" /> |
| 16 </if> | 16 </if> |
| 17 <if expr="is_win"> | 17 <if expr="is_win"> |
| 18 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.htm
l" flattenhtml="true" type="chrome_html" /> | 18 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.htm
l" flattenhtml="true" type="chrome_html" /> |
| 19 </if> | 19 </if> |
| 20 <structure name="IDR_ABOUT_MEMORY_CSS" file="resources\about_memory.css" f
lattenhtml="true" type="chrome_html" /> | 20 <structure name="IDR_ABOUT_MEMORY_CSS" file="resources\about_memory.css" f
lattenhtml="true" type="chrome_html" /> |
| 21 <structure name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.htm
l" flattenhtml="true" allowexternalscript="true" type="chrome_html" /> | |
| 22 <if expr="enable_app_list"> | 21 <if expr="enable_app_list"> |
| 23 <structure name="IDR_APP_LIST_START_PAGE_CSS" file="resources\app_list\s
tart_page.css" flattenhtml="true" type="chrome_html" /> | 22 <structure name="IDR_APP_LIST_START_PAGE_CSS" file="resources\app_list\s
tart_page.css" flattenhtml="true" type="chrome_html" /> |
| 24 <structure name="IDR_APP_LIST_START_PAGE_HTML" file="resources\app_list\
start_page.html" flattenhtml="true" type="chrome_html" /> | 23 <structure name="IDR_APP_LIST_START_PAGE_HTML" file="resources\app_list\
start_page.html" flattenhtml="true" type="chrome_html" /> |
| 25 <structure name="IDR_APP_LIST_START_PAGE_JS" file="resources\app_list\st
art_page.js" flattenhtml="true" type="chrome_html" /> | 24 <structure name="IDR_APP_LIST_START_PAGE_JS" file="resources\app_list\st
art_page.js" flattenhtml="true" type="chrome_html" /> |
| 26 </if> | 25 </if> |
| 27 <if expr="not is_android"> | 26 <if expr="not is_android"> |
| 28 <structure name="IDR_DOWNLOADS_DOWNLOADS_HTML" file="resources\downloads
\downloads.html" flattenhtml="true" allowexternalscript="true" type="chrome_html
" /> | 27 <structure name="IDR_DOWNLOADS_DOWNLOADS_HTML" file="resources\downloads
\downloads.html" flattenhtml="true" allowexternalscript="true" type="chrome_html
" /> |
| 29 <structure name="IDR_MD_DOWNLOADS_DOWNLOADS_HTML" file="resources\md_dow
nloads\downloads.html" flattenhtml="true" allowexternalscript="true" type="chrom
e_html" /> | 28 <structure name="IDR_MD_DOWNLOADS_DOWNLOADS_HTML" file="resources\md_dow
nloads\downloads.html" flattenhtml="true" allowexternalscript="true" type="chrom
e_html" /> |
| 30 </if> | 29 </if> |
| 31 <if expr="enable_extensions"> | 30 <if expr="enable_extensions"> |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 </if> | 80 </if> |
| 82 <include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" flatt
enhtml="true" type="BINDATA" /> | 81 <include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" flatt
enhtml="true" type="BINDATA" /> |
| 83 <if expr="not disable_nacl"> | 82 <if expr="not disable_nacl"> |
| 84 <include name="IDR_ABOUT_NACL_HTML" file="resources\about_nacl.html" fla
ttenhtml="true" allowexternalscript="true" type="BINDATA" /> | 83 <include name="IDR_ABOUT_NACL_HTML" file="resources\about_nacl.html" fla
ttenhtml="true" allowexternalscript="true" type="BINDATA" /> |
| 85 <include name="IDR_ABOUT_NACL_CSS" file="resources\about_nacl.css" flatt
enhtml="true" type="chrome_html" /> | 84 <include name="IDR_ABOUT_NACL_CSS" file="resources\about_nacl.css" flatt
enhtml="true" type="chrome_html" /> |
| 86 <include name="IDR_ABOUT_NACL_JS" file="resources\about_nacl.js" type="B
INDATA" /> | 85 <include name="IDR_ABOUT_NACL_JS" file="resources\about_nacl.js" type="B
INDATA" /> |
| 87 </if> | 86 </if> |
| 88 <if expr="not is_android"> | 87 <if expr="not is_android"> |
| 89 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys\about_sys.h
tml" flattenhtml="true" type="BINDATA" /> | 88 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys\about_sys.h
tml" flattenhtml="true" type="BINDATA" /> |
| 90 </if> | 89 </if> |
| 91 <include name="IDR_ABOUT_VERSION_JS" file="resources\about_version.js" typ
e="BINDATA" /> | |
| 92 <include name="IDR_ABOUT_VERSION_CSS" file="resources\about_version.css" t
ype="BINDATA" /> | |
| 93 <include name="IDR_AD_NETWORK_HASHES" file="resources\ad_networks.dat" typ
e="BINDATA" /> | 90 <include name="IDR_AD_NETWORK_HASHES" file="resources\ad_networks.dat" typ
e="BINDATA" /> |
| 94 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma
nifest.json" type="BINDATA" /> | 91 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma
nifest.json" type="BINDATA" /> |
| 95 <if expr="is_posix and not is_macosx and not is_ios"> | 92 <if expr="is_posix and not is_macosx and not is_ios"> |
| 96 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_
viewer.html" type="BINDATA" /> | 93 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_
viewer.html" type="BINDATA" /> |
| 97 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi
ewer.js" type="BINDATA" /> | 94 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi
ewer.js" type="BINDATA" /> |
| 98 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v
iewer.css" type="BINDATA" /> | 95 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v
iewer.css" type="BINDATA" /> |
| 99 </if> | 96 </if> |
| 100 <if expr="enable_app_list"> | 97 <if expr="enable_app_list"> |
| 101 <include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manif
est.json" type="BINDATA" /> | 98 <include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manif
est.json" type="BINDATA" /> |
| 102 </if> | 99 </if> |
| (...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 446 </if> | 443 </if> |
| 447 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im
e\manifest.json" type="BINDATA" /> | 444 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im
e\manifest.json" type="BINDATA" /> |
| 448 </if> | 445 </if> |
| 449 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p
roxy\manifest.json" type="BINDATA" /> | 446 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p
roxy\manifest.json" type="BINDATA" /> |
| 450 <if expr="enable_media_router"> | 447 <if expr="enable_media_router"> |
| 451 <part file="media_router_resources.grdp" /> | 448 <part file="media_router_resources.grdp" /> |
| 452 </if> | 449 </if> |
| 453 </includes> | 450 </includes> |
| 454 </release> | 451 </release> |
| 455 </grit> | 452 </grit> |
| OLD | NEW |