| 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" t
ype="chrome_html" /> | 20 <structure name="IDR_ABOUT_MEMORY_CSS" file="resources\about_memory.css" t
ype="chrome_html" /> |
| 21 <structure name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.htm
l" flattenhtml="true" allowexternalscript="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"> | 22 <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" /> | 23 <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" /> | 24 <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" /> | 25 <structure name="IDR_APP_LIST_START_PAGE_JS" file="resources\app_list\st
art_page.js" flattenhtml="true" type="chrome_html" /> |
| 26 <structure name="IDR_APP_LIST_HOTWORD_NACL_NMF" file="resources\app_list
\hotword_nacl.nmf" flattenhtml="true" type="chrome_html" /> | |
| 27 </if> | 26 </if> |
| 28 <if expr="is_android"> | 27 <if expr="is_android"> |
| 29 <structure name="IDR_CONTEXTUAL_SEARCH_PROMO_CSS" file="resources\contex
tual_search\promo.css" flattenhtml="true" type="chrome_html" /> | 28 <structure name="IDR_CONTEXTUAL_SEARCH_PROMO_CSS" file="resources\contex
tual_search\promo.css" flattenhtml="true" type="chrome_html" /> |
| 30 <structure name="IDR_CONTEXTUAL_SEARCH_PROMO_HTML" file="resources\conte
xtual_search\promo.html" flattenhtml="true" type="chrome_html" /> | 29 <structure name="IDR_CONTEXTUAL_SEARCH_PROMO_HTML" file="resources\conte
xtual_search\promo.html" flattenhtml="true" type="chrome_html" /> |
| 31 </if> | 30 </if> |
| 32 <if expr="not is_android"> | 31 <if expr="not is_android"> |
| 33 <structure name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads.
css" flattenhtml="true" type="chrome_html" /> | 32 <structure name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads.
css" flattenhtml="true" type="chrome_html" /> |
| 34 <structure name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads
.html" flattenhtml="true" allowexternalscript="true" type="chrome_html" /> | 33 <structure name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads
.html" flattenhtml="true" allowexternalscript="true" type="chrome_html" /> |
| 35 </if> | 34 </if> |
| 36 <if expr="enable_extensions"> | 35 <if expr="enable_extensions"> |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 <include name="IDR_FEEDBACK_MANIFEST" file="resources\feedback\manifest.js
on" type="BINDATA" /> | 141 <include name="IDR_FEEDBACK_MANIFEST" file="resources\feedback\manifest.js
on" type="BINDATA" /> |
| 143 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr
ue" type="BINDATA" /> | 142 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr
ue" type="BINDATA" /> |
| 144 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> | 143 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> |
| 145 <if expr="is_android"> | 144 <if expr="is_android"> |
| 146 <include name="IDR_GET_SALIENT_IMAGE_URL_JS" file="resources\get_salient
_image_url.js" type="BINDATA" /> | 145 <include name="IDR_GET_SALIENT_IMAGE_URL_JS" file="resources\get_salient
_image_url.js" type="BINDATA" /> |
| 147 </if> | 146 </if> |
| 148 <if expr="_google_chrome or enable_hangout_services_extension"> | 147 <if expr="_google_chrome or enable_hangout_services_extension"> |
| 149 <!-- Hangout Services extension, included in Google Chrome builds only.
--> | 148 <!-- Hangout Services extension, included in Google Chrome builds only.
--> |
| 150 <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_se
rvices\manifest.json" type="BINDATA" /> | 149 <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_se
rvices\manifest.json" type="BINDATA" /> |
| 151 </if> | 150 </if> |
| 152 <include name="IDR_HOTWORD_HELPER_MANIFEST" file="resources\hotword_helper
\manifest.json" type="BINDATA" /> | |
| 153 <include name="IDR_HOTWORD_MANIFEST" file="resources\hotword\manifest.json
" type="BINDATA" /> | 151 <include name="IDR_HOTWORD_MANIFEST" file="resources\hotword\manifest.json
" type="BINDATA" /> |
| 154 <include name="IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST" file="resources\ho
tword_audio_verification\manifest.json" type="BINDATA" /> | 152 <include name="IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST" file="resources\ho
tword_audio_verification\manifest.json" type="BINDATA" /> |
| 155 <if expr="not is_android"> | 153 <if expr="not is_android"> |
| 156 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="t
rue" type="BINDATA" /> | 154 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="t
rue" type="BINDATA" /> |
| 157 <include name="IDR_HELP_PAGE_JS" file="resources\help\help_page.js" flat
tenhtml="true" type="BINDATA" /> | 155 <include name="IDR_HELP_PAGE_JS" file="resources\help\help_page.js" flat
tenhtml="true" type="BINDATA" /> |
| 158 <include name="IDR_CHANNEL_CHANGE_PAGE_JS" file="resources\help\channel_
change_page.js" flattenhtml="true" type="BINDATA" /> | 156 <include name="IDR_CHANNEL_CHANGE_PAGE_JS" file="resources\help\channel_
change_page.js" flattenhtml="true" type="BINDATA" /> |
| 159 </if> | 157 </if> |
| 160 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla
ttenhtml="true" allowexternalscript="true" type="BINDATA" /> | 158 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla
ttenhtml="true" allowexternalscript="true" type="BINDATA" /> |
| 161 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten
html="true" type="BINDATA" /> | 159 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten
html="true" type="BINDATA" /> |
| 162 <include name="IDR_OTHER_DEVICES_JS" file="resources\history\other_devices
.js" flattenhtml="true" type="BINDATA" /> | 160 <include name="IDR_OTHER_DEVICES_JS" file="resources\history\other_devices
.js" flattenhtml="true" type="BINDATA" /> |
| (...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 443 </if> | 441 </if> |
| 444 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho
d\hangul_manifest.json" type="BINDATA" /> | 442 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho
d\hangul_manifest.json" type="BINDATA" /> |
| 445 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im
e\manifest.json" type="BINDATA" /> | 443 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im
e\manifest.json" type="BINDATA" /> |
| 446 </if> | 444 </if> |
| 447 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p
roxy\manifest.json" type="BINDATA" /> | 445 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p
roxy\manifest.json" type="BINDATA" /> |
| 448 <include name="IDR_MD_SETTINGS_UI_HTML" file="resources\md_settings\md_set
tings.html" type="BINDATA" /> | 446 <include name="IDR_MD_SETTINGS_UI_HTML" file="resources\md_settings\md_set
tings.html" type="BINDATA" /> |
| 449 <include name="IDR_MD_SETTINGS_UI_CSS" file="resources\md_settings\md_sett
ings.css" type="BINDATA" /> | 447 <include name="IDR_MD_SETTINGS_UI_CSS" file="resources\md_settings\md_sett
ings.css" type="BINDATA" /> |
| 450 </includes> | 448 </includes> |
| 451 </release> | 449 </release> |
| 452 </grit> | 450 </grit> |
| OLD | NEW |