| 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. --> | 3 without changes to the corresponding grd file. --> |
| 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/component_extension_resources.h" type="rc_header"> | 6 <output filename="grit/component_extension_resources.h" type="rc_header"> |
| 7 <emit emit_type='prepend'></emit> | 7 <emit emit_type='prepend'></emit> |
| 8 </output> | 8 </output> |
| 9 <output filename="grit/component_extension_resources_map.cc" type="resource_
file_map_source" /> | 9 <output filename="grit/component_extension_resources_map.cc" type="resource_
file_map_source" /> |
| 10 <output filename="grit/component_extension_resources_map.h" type="resource_m
ap_header" /> | 10 <output filename="grit/component_extension_resources_map.h" type="resource_m
ap_header" /> |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 <!-- Hangout Services extension, included in Google Chrome builds only. --
> | 56 <!-- Hangout Services extension, included in Google Chrome builds only. --
> |
| 57 <if expr="_google_chrome or enable_hangout_services_extension"> | 57 <if expr="_google_chrome or enable_hangout_services_extension"> |
| 58 <include name="IDR_HANGOUT_SERVICES_BACKGROUND_HTML" file="hangout_servi
ces/background.html" type="BINDATA" /> | 58 <include name="IDR_HANGOUT_SERVICES_BACKGROUND_HTML" file="hangout_servi
ces/background.html" type="BINDATA" /> |
| 59 <include name="IDR_HANGOUT_SERVICES_THUNK_JS" file="hangout_services/thu
nk.js" type="BINDATA" /> | 59 <include name="IDR_HANGOUT_SERVICES_THUNK_JS" file="hangout_services/thu
nk.js" type="BINDATA" /> |
| 60 </if> | 60 </if> |
| 61 <!-- Hotword Helper extension --> | 61 <!-- Hotword Helper extension --> |
| 62 <if expr="enable_extensions"> | 62 <if expr="enable_extensions"> |
| 63 <include name="IDR_HOTWORD_HELPER_AUDIO_CLIENT_JS" file="hotword_helper/
audio_client.js" type="BINDATA" /> | 63 <include name="IDR_HOTWORD_HELPER_AUDIO_CLIENT_JS" file="hotword_helper/
audio_client.js" type="BINDATA" /> |
| 64 <include name="IDR_HOTWORD_HELPER_MANAGER_JS" file="hotword_helper/manag
er.js" type="BINDATA" /> | 64 <include name="IDR_HOTWORD_HELPER_MANAGER_JS" file="hotword_helper/manag
er.js" type="BINDATA" /> |
| 65 </if> | 65 </if> |
| 66 <include name="IDR_FEEDBACK_DEFAULT_HTML" file="feedback/html/default.html
" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> | 66 <if expr="not is_android"> |
| 67 <include name="IDR_FEEDBACK_EVENT_HANDLER_JS" file="feedback/js/event_hand
ler.js" flattenhtml="true" type="BINDATA" /> | 67 <include name="IDR_FEEDBACK_DEFAULT_HTML" file="feedback/html/default.ht
ml" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> |
| 68 <include name="IDR_FEEDBACK_FEEDBACK_JS" file="feedback/js/feedback.js" fl
attenhtml="true" type="BINDATA" /> | 68 <include name="IDR_FEEDBACK_EVENT_HANDLER_JS" file="feedback/js/event_ha
ndler.js" flattenhtml="true" type="BINDATA" /> |
| 69 <include name="IDR_FEEDBACK_TAKE_SCREENSHOT_JS" file="feedback/js/take_scr
eenshot.js" flattenhtml="true" type="BINDATA" /> | 69 <include name="IDR_FEEDBACK_FEEDBACK_JS" file="feedback/js/feedback.js"
flattenhtml="true" type="BINDATA" /> |
| 70 <include name="IDR_FEEDBACK_TOPBAR_HANDLER_JS" file="feedback/js/topbar_ha
ndlers.js" flattenhtml="true" type="BINDATA" /> | 70 <include name="IDR_FEEDBACK_TAKE_SCREENSHOT_JS" file="feedback/js/take_s
creenshot.js" flattenhtml="true" type="BINDATA" /> |
| 71 <include name="IDR_FEEDBACK_FEEDBACK_CSS" file="feedback/css/feedback.css"
type="BINDATA" /> | 71 <include name="IDR_FEEDBACK_TOPBAR_HANDLER_JS" file="feedback/js/topbar_
handlers.js" flattenhtml="true" type="BINDATA" /> |
| 72 <include name="IDR_FEEDBACK_ICON_32" file="feedback/images/icon32.png" typ
e="BINDATA" /> | 72 <include name="IDR_FEEDBACK_FEEDBACK_CSS" file="feedback/css/feedback.cs
s" type="BINDATA" /> |
| 73 <include name="IDR_FEEDBACK_ICON_64" file="feedback/images/icon64.png" typ
e="BINDATA" /> | 73 <include name="IDR_FEEDBACK_ICON_32" file="feedback/images/icon32.png" t
ype="BINDATA" /> |
| 74 <include name="IDR_FEEDBACK_ICON_64" file="feedback/images/icon64.png" t
ype="BINDATA" /> |
| 75 </if> |
| 74 <if expr="enable_google_now"> | 76 <if expr="enable_google_now"> |
| 75 <include name="IDR_GOOGLE_NOW_BACKGROUND_JS" file="google_now/background
.js" type="BINDATA" /> | 77 <include name="IDR_GOOGLE_NOW_BACKGROUND_JS" file="google_now/background
.js" type="BINDATA" /> |
| 76 <include name="IDR_GOOGLE_NOW_CARDS_JS" file="google_now/cards.js" type=
"BINDATA" /> | 78 <include name="IDR_GOOGLE_NOW_CARDS_JS" file="google_now/cards.js" type=
"BINDATA" /> |
| 77 <include name="IDR_GOOGLE_NOW_UTILITY_JS" file="google_now/utility.js" t
ype="BINDATA" /> | 79 <include name="IDR_GOOGLE_NOW_UTILITY_JS" file="google_now/utility.js" t
ype="BINDATA" /> |
| 78 <include name="IDR_GOOGLE_NOW_ICON_16" file="google_now/images/icon16.pn
g" type="BINDATA" /> | 80 <include name="IDR_GOOGLE_NOW_ICON_16" file="google_now/images/icon16.pn
g" type="BINDATA" /> |
| 79 <include name="IDR_GOOGLE_NOW_ICON_48" file="google_now/images/icon48.pn
g" type="BINDATA" /> | 81 <include name="IDR_GOOGLE_NOW_ICON_48" file="google_now/images/icon48.pn
g" type="BINDATA" /> |
| 80 <include name="IDR_GOOGLE_NOW_ICON_128" file="google_now/images/icon128.
png" type="BINDATA" /> | 82 <include name="IDR_GOOGLE_NOW_ICON_128" file="google_now/images/icon128.
png" type="BINDATA" /> |
| 81 </if> | 83 </if> |
| 82 <include name="IDR_IDENTITY_API_SCOPE_APPROVAL_BACKGROUND_JS" file="identi
ty_scope_approval_dialog/background.js" type="BINDATA" /> | 84 <include name="IDR_IDENTITY_API_SCOPE_APPROVAL_BACKGROUND_JS" file="identi
ty_scope_approval_dialog/background.js" type="BINDATA" /> |
| 83 <include name="IDR_IDENTITY_API_SCOPE_APPROVAL_DIALOG_CSS" file="identity_
scope_approval_dialog/scope_approval_dialog.css" type="BINDATA" /> | 85 <include name="IDR_IDENTITY_API_SCOPE_APPROVAL_DIALOG_CSS" file="identity_
scope_approval_dialog/scope_approval_dialog.css" type="BINDATA" /> |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 <include name="IDR_LEDGER_BACKGROUND_HTML" file="../extensions/api/ledge
r/ledger_proxy/background.html" flattenhtml="true" allowexternalscript="true" ty
pe="BINDATA" /> | 168 <include name="IDR_LEDGER_BACKGROUND_HTML" file="../extensions/api/ledge
r/ledger_proxy/background.html" flattenhtml="true" allowexternalscript="true" ty
pe="BINDATA" /> |
| 167 <include name="IDR_LEDGER_INIT_JS" file="../extensions/api/ledger/ledger
_proxy/js/init.js" type="BINDATA" /> | 169 <include name="IDR_LEDGER_INIT_JS" file="../extensions/api/ledger/ledger
_proxy/js/init.js" type="BINDATA" /> |
| 168 <include name="IDR_LEDGER_NACL_JS" file="../extensions/api/ledger/ledger
_proxy/js/nacl.js" type="BINDATA" /> | 170 <include name="IDR_LEDGER_NACL_JS" file="../extensions/api/ledger/ledger
_proxy/js/nacl.js" type="BINDATA" /> |
| 169 <include name="IDR_LEDGER_WRAPPER_JS" file="../extensions/api/ledger/led
ger_proxy/js/wrapper.js" type="BINDATA" /> | 171 <include name="IDR_LEDGER_WRAPPER_JS" file="../extensions/api/ledger/led
ger_proxy/js/wrapper.js" type="BINDATA" /> |
| 170 <include name="IDR_LEDGER_LEDGER_PROXY_NMF" file="../extensions/api/ledg
er/ledger_proxy/ledger_proxy.nmf.js" type="BINDATA" /> | 172 <include name="IDR_LEDGER_LEDGER_PROXY_NMF" file="../extensions/api/ledg
er/ledger_proxy/ledger_proxy.nmf.js" type="BINDATA" /> |
| 171 <include name="IDR_LEDGER_LEDGER_PROXY_PEXE" file="../extensions/api/led
ger/ledger_proxy/ledger_proxy_pnacl.pexe.js" type="BINDATA" /> | 173 <include name="IDR_LEDGER_LEDGER_PROXY_PEXE" file="../extensions/api/led
ger/ledger_proxy/ledger_proxy_pnacl.pexe.js" type="BINDATA" /> |
| 172 </if> | 174 </if> |
| 173 </includes> | 175 </includes> |
| 174 </release> | 176 </release> |
| 175 </grit> | 177 </grit> |
| OLD | NEW |