| 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 <output filename="browser_resources.rc" type="rc_all" /> | 8 <output filename="browser_resources.rc" type="rc_all" /> |
| 9 </outputs> | 9 </outputs> |
| 10 <release seq="1"> | 10 <release seq="1"> |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 </if> | 56 </if> |
| 57 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extension
_list.js" flattenhtml="true" type="BINDATA" /> | 57 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extension
_list.js" flattenhtml="true" type="BINDATA" /> |
| 58 <include name="IDR_EXTENSION_ACTIVITY_HTML" file="resources\extensions\ext
ension_activity.html" flattenhtml="true" type="BINDATA" /> | 58 <include name="IDR_EXTENSION_ACTIVITY_HTML" file="resources\extensions\ext
ension_activity.html" flattenhtml="true" type="BINDATA" /> |
| 59 <include name="IDR_EXTENSION_ACTIVITY_JS" file="resources\extensions\exten
sion_activity.js" flattenhtml="true" type="BINDATA" /> | 59 <include name="IDR_EXTENSION_ACTIVITY_JS" file="resources\extensions\exten
sion_activity.js" flattenhtml="true" type="BINDATA" /> |
| 60 <include name="IDR_EXTENSIONS_HTML" file="resources\extensions\extensions.
html" flattenhtml="true" type="BINDATA" /> | 60 <include name="IDR_EXTENSIONS_HTML" file="resources\extensions\extensions.
html" flattenhtml="true" type="BINDATA" /> |
| 61 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions.js
" flattenhtml="true" type="BINDATA" /> | 61 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions.js
" flattenhtml="true" type="BINDATA" /> |
| 62 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr
ue" type="BINDATA" /> | 62 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr
ue" type="BINDATA" /> |
| 63 <include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html"
flattenhtml="true" type="BINDATA" /> | 63 <include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html"
flattenhtml="true" type="BINDATA" /> |
| 64 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> | 64 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> |
| 65 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html"
flattenhtml="true" type="BINDATA" /> | 65 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html"
flattenhtml="true" type="BINDATA" /> |
| 66 <include name="IDR_HELP_CSS" file="resources\help\help.css" flattenhtml="t
rue" type="BINDATA" /> |
| 67 <include name="IDR_HELP_HTML" file="resources\help\help.html" flattenhtml=
"true" type="BINDATA" /> |
| 68 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="tru
e" type="BINDATA" /> |
| 66 <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list\
software_rendering_list.json" type="BINDATA" /> | 69 <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list\
software_rendering_list.json" type="BINDATA" /> |
| 67 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals\gpu_i
nternals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> | 70 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals\gpu_i
nternals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> |
| 68 <include name="IDR_GPU_INTERNALS_JS" file="resources\gpu_internals\gpu_int
ernals.js" flattenhtml="true" type="BINDATA" /> | 71 <include name="IDR_GPU_INTERNALS_JS" file="resources\gpu_internals\gpu_int
ernals.js" flattenhtml="true" type="BINDATA" /> |
| 69 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml
="true" allowexternalscript="true" type="BINDATA" /> | 72 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml
="true" allowexternalscript="true" type="BINDATA" /> |
| 70 <include name="IDR_HISTORY_JS" file="resources\history.js" type="BINDATA"
/> | 73 <include name="IDR_HISTORY_JS" file="resources\history.js" type="BINDATA"
/> |
| 71 <include name="IDR_HUNG_RENDERER_DIALOG_CSS" file="resources\hung_renderer
_dialog.css" type="BINDATA" /> | 74 <include name="IDR_HUNG_RENDERER_DIALOG_CSS" file="resources\hung_renderer
_dialog.css" type="BINDATA" /> |
| 72 <include name="IDR_HUNG_RENDERER_DIALOG_HTML" file="resources\hung_rendere
r_dialog.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> | 75 <include name="IDR_HUNG_RENDERER_DIALOG_HTML" file="resources\hung_rendere
r_dialog.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> |
| 73 <include name="IDR_HUNG_RENDERER_DIALOG_JS" file="resources\hung_renderer_
dialog.js" type="BINDATA" /> | 76 <include name="IDR_HUNG_RENDERER_DIALOG_JS" file="resources\hung_renderer_
dialog.js" type="BINDATA" /> |
| 74 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html"
flattenhtml="true" type="BINDATA" /> | 77 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html"
flattenhtml="true" type="BINDATA" /> |
| 75 <include name="IDR_INPUT_WINDOW_DIALOG_HTML" file="resources\input_window_
dialog.html" flattenhtml="true" type="BINDATA" /> | 78 <include name="IDR_INPUT_WINDOW_DIALOG_HTML" file="resources\input_window_
dialog.html" flattenhtml="true" type="BINDATA" /> |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 <include name="IDR_UBER_FRAME_HTML" file="resources\uber\uber_frame.html"
flattenhtml="true" type="BINDATA" /> | 140 <include name="IDR_UBER_FRAME_HTML" file="resources\uber\uber_frame.html"
flattenhtml="true" type="BINDATA" /> |
| 138 <include name="IDR_UBER_FRAME_JS" file="resources\uber\uber_frame.js" flat
tenhtml="true" type="BINDATA" /> | 141 <include name="IDR_UBER_FRAME_JS" file="resources\uber\uber_frame.js" flat
tenhtml="true" type="BINDATA" /> |
| 139 <include name="IDR_UBER_UTILS_JS" file="resources\uber\uber_utils.js" type
="BINDATA" /> | 142 <include name="IDR_UBER_UTILS_JS" file="resources\uber\uber_utils.js" type
="BINDATA" /> |
| 140 <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifes
t.json" type="BINDATA" /> | 143 <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifes
t.json" type="BINDATA" /> |
| 141 <include name="IDR_ENTERPRISE_WEBSTORE_MANIFEST" file="resources\enterpris
e_webstore_app\manifest.json" type="BINDATA" /> | 144 <include name="IDR_ENTERPRISE_WEBSTORE_MANIFEST" file="resources\enterpris
e_webstore_app\manifest.json" type="BINDATA" /> |
| 142 <if expr="not pp_ifdef('chromeos')"> | 145 <if expr="not pp_ifdef('chromeos')"> |
| 143 <include name="IDR_SYNC_PROMO_JS" file="resources\sync_promo\sync_promo.
js" flattenhtml="true" type="BINDATA" /> | 146 <include name="IDR_SYNC_PROMO_JS" file="resources\sync_promo\sync_promo.
js" flattenhtml="true" type="BINDATA" /> |
| 144 <include name="IDR_SYNC_PROMO_HTML" file="resources\sync_promo\sync_prom
o.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> | 147 <include name="IDR_SYNC_PROMO_HTML" file="resources\sync_promo\sync_prom
o.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> |
| 145 </if> | 148 </if> |
| 146 <if expr="pp_ifdef('chromeos')"> | 149 <if expr="pp_ifdef('chromeos')"> |
| 147 <include name="IDR_ABOUT_PAGE_HTML" file="resources\about_page\about_pag
e.html" flattenhtml="true" type="BINDATA" /> | |
| 148 <include name="IDR_ABOUT_PAGE_JS" file="resources\about_page\about_page.
js" flattenhtml="true" type="BINDATA" /> | |
| 149 <include name="IDR_ABOUT_SYS_HTML" file="resources\chromeos\about_sys.ht
ml" flattenhtml="true" type="BINDATA" /> | 150 <include name="IDR_ABOUT_SYS_HTML" file="resources\chromeos\about_sys.ht
ml" flattenhtml="true" type="BINDATA" /> |
| 150 <include name="IDR_ACTIVE_DOWNLOADS_HTML" file="resources\chromeos\activ
e_downloads.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /
> | 151 <include name="IDR_ACTIVE_DOWNLOADS_HTML" file="resources\chromeos\activ
e_downloads.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /
> |
| 151 <include name="IDR_ACTIVE_DOWNLOADS_JS" file="resources\chromeos\active_
downloads.js" type="BINDATA" /> | 152 <include name="IDR_ACTIVE_DOWNLOADS_JS" file="resources\chromeos\active_
downloads.js" type="BINDATA" /> |
| 152 <include name="IDR_CHOOSE_MOBILE_NETWORK_HTML" file="resources\chromeos\
choose_mobile_network.html" flattenhtml="true" allowexternalscript="true" type="
BINDATA" /> | 153 <include name="IDR_CHOOSE_MOBILE_NETWORK_HTML" file="resources\chromeos\
choose_mobile_network.html" flattenhtml="true" allowexternalscript="true" type="
BINDATA" /> |
| 153 <include name="IDR_CHOOSE_MOBILE_NETWORK_JS" file="resources\chromeos\ch
oose_mobile_network.js" type="BINDATA" /> | 154 <include name="IDR_CHOOSE_MOBILE_NETWORK_JS" file="resources\chromeos\ch
oose_mobile_network.js" type="BINDATA" /> |
| 154 <!-- manifest file of ChromeVox accessibility extension --> | 155 <!-- manifest file of ChromeVox accessibility extension --> |
| 155 <include name="IDR_CHROMEVOX_MANIFEST" file="resources\chromeos\access_c
hromevox\manifest.json" type="BINDATA" /> | 156 <include name="IDR_CHROMEVOX_MANIFEST" file="resources\chromeos\access_c
hromevox\manifest.json" type="BINDATA" /> |
| 156 <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\chromeos\gaia_aut
h\manifest.json" type="BINDATA" /> | 157 <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\chromeos\gaia_aut
h\manifest.json" type="BINDATA" /> |
| 157 <include name="IDR_GAIA_TEST_AUTH_MANIFEST" file="resources\chromeos\gai
a_auth\manifest_test.json" type="BINDATA" /> | 158 <include name="IDR_GAIA_TEST_AUTH_MANIFEST" file="resources\chromeos\gai
a_auth\manifest_test.json" type="BINDATA" /> |
| 158 <include name="IDR_GUEST_SESSION_TAB_HTML" file="resources\chromeos\gues
t_session_tab.html" flattenhtml="true" type="BINDATA" /> | 159 <include name="IDR_GUEST_SESSION_TAB_HTML" file="resources\chromeos\gues
t_session_tab.html" flattenhtml="true" type="BINDATA" /> |
| (...skipping 25 matching lines...) Expand all Loading... |
| 184 <include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_coo
kies.html" flattenhtml="true" type="BINDATA" /> | 185 <include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_coo
kies.html" flattenhtml="true" type="BINDATA" /> |
| 185 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt
enhtml="true" type="BINDATA" /> | 186 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt
enhtml="true" type="BINDATA" /> |
| 186 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo
dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" /> | 187 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo
dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" /> |
| 187 </if> | 188 </if> |
| 188 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> | 189 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> |
| 189 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json
" type="BINDATA" /> | 190 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json
" type="BINDATA" /> |
| 190 </if> | 191 </if> |
| 191 </includes> | 192 </includes> |
| 192 </release> | 193 </release> |
| 193 </grit> | 194 </grit> |
| OLD | NEW |