| Index: chrome/browser/resources/component_extension_resources.grd
|
| diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome/browser/resources/component_extension_resources.grd
|
| index eb14409609d9a2d1285ce908ba652028f3e8c32d..76e1856e88ef3917038ffa7ec10a81570f4e4baf 100644
|
| --- a/chrome/browser/resources/component_extension_resources.grd
|
| +++ b/chrome/browser/resources/component_extension_resources.grd
|
| @@ -64,7 +64,7 @@
|
| <include name="IDR_GAIA_AUTH_INLINE_INJECTED_JS" file="gaia_auth/inline_injected.js" type="BINDATA" />
|
| <include name="IDR_GAIA_AUTH_INLINE_MAIN" file="gaia_auth/inline_main.html" allowexternalscript="true" type="BINDATA" />
|
| <!-- Hangout Services extension, included in Google Chrome builds only. -->
|
| - <if expr="pp_ifdef('_google_chrome')">
|
| + <if expr="pp_ifdef('_google_chrome') or pp_ifdef('enable_hangout_services_extension')">
|
| <include name="IDR_HANGOUT_SERVICES_BACKGROUND_HTML" file="hangout_services/background.html" type="BINDATA" />
|
| <include name="IDR_HANGOUT_SERVICES_THUNK_JS" file="hangout_services/thunk.js" type="BINDATA" />
|
| </if>
|
|
|