diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
| commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
| tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/content/content_resources.grd | |
| parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
| download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz | |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/content/content_resources.grd')
| -rw-r--r-- | chromium/content/content_resources.grd | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/chromium/content/content_resources.grd b/chromium/content/content_resources.grd index 7e87003ad5d..99e1fa75b87 100644 --- a/chromium/content/content_resources.grd +++ b/chromium/content/content_resources.grd @@ -27,6 +27,9 @@ <include name="IDR_INDEXED_DB_INTERNALS_CSS" file="browser/resources/indexed_db/indexeddb_internals.css" flattenhtml="true" type="BINDATA" /> <include name="IDR_MEDIA_INTERNALS_HTML" file="browser/resources/media/media_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_MEDIA_INTERNALS_JS" file="browser/resources/media/media_internals.js" flattenhtml="true" type="BINDATA" /> + <include name="IDR_NETWORK_ERROR_LISTING_HTML" file="browser/resources/net/network_errors_listing.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_NETWORK_ERROR_LISTING_JS" file="browser/resources/net/network_errors_listing.js" flattenhtml="true" type="BINDATA" /> + <include name="IDR_NETWORK_ERROR_LISTING_CSS" file="browser/resources/net/network_errors_listing.css" flattenhtml="true" type="BINDATA" /> <include name="IDR_SERVICE_WORKER_INTERNALS_HTML" file="browser/resources/service_worker/serviceworker_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_SERVICE_WORKER_INTERNALS_JS" file="browser/resources/service_worker/serviceworker_internals.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_SERVICE_WORKER_INTERNALS_CSS" file="browser/resources/service_worker/serviceworker_internals.css" flattenhtml="true" type="BINDATA" /> @@ -40,14 +43,14 @@ <include name="IDR_UTILITY_SANDBOX_PROFILE" file="utility/utility.sb" type="BINDATA" /> </if> <if expr="not is_ios"> - <include name="IDR_MOJO_BINDINGS_JS" file="../third_party/mojo/src/mojo/public/js/bindings.js" flattenhtml="true" type="BINDATA" /> - <include name="IDR_MOJO_BUFFER_JS" file="../third_party/mojo/src/mojo/public/js/buffer.js" flattenhtml="true" type="BINDATA" /> - <include name="IDR_MOJO_CODEC_JS" file="../third_party/mojo/src/mojo/public/js/codec.js" flattenhtml="true" type="BINDATA" /> - <include name="IDR_MOJO_CONNECTION_JS" file="../third_party/mojo/src/mojo/public/js/connection.js" flattenhtml="true" type="BINDATA" /> - <include name="IDR_MOJO_CONNECTOR_JS" file="../third_party/mojo/src/mojo/public/js/connector.js" flattenhtml="true" type="BINDATA" /> - <include name="IDR_MOJO_ROUTER_JS" file="../third_party/mojo/src/mojo/public/js/router.js" flattenhtml="true" type="BINDATA" /> - <include name="IDR_MOJO_UNICODE_JS" file="../third_party/mojo/src/mojo/public/js/unicode.js" flattenhtml="true" type="BINDATA" /> - <include name="IDR_MOJO_VALIDATOR_JS" file="../third_party/mojo/src/mojo/public/js/validator.js" flattenhtml="true" type="BINDATA" /> + <include name="IDR_MOJO_BINDINGS_JS" file="../mojo/public/js/bindings.js" flattenhtml="true" type="BINDATA" /> + <include name="IDR_MOJO_BUFFER_JS" file="../mojo/public/js/buffer.js" flattenhtml="true" type="BINDATA" /> + <include name="IDR_MOJO_CODEC_JS" file="../mojo/public/js/codec.js" flattenhtml="true" type="BINDATA" /> + <include name="IDR_MOJO_CONNECTION_JS" file="../mojo/public/js/connection.js" flattenhtml="true" type="BINDATA" /> + <include name="IDR_MOJO_CONNECTOR_JS" file="../mojo/public/js/connector.js" flattenhtml="true" type="BINDATA" /> + <include name="IDR_MOJO_ROUTER_JS" file="../mojo/public/js/router.js" flattenhtml="true" type="BINDATA" /> + <include name="IDR_MOJO_UNICODE_JS" file="../mojo/public/js/unicode.js" flattenhtml="true" type="BINDATA" /> + <include name="IDR_MOJO_VALIDATOR_JS" file="../mojo/public/js/validator.js" flattenhtml="true" type="BINDATA" /> </if> </includes> </release> |