diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-18 14:10:49 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-18 13:53:24 +0000 |
commit | 813fbf95af77a531c57a8c497345ad2c61d475b3 (patch) | |
tree | 821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/components/resources | |
parent | af6588f8d723931a298c995fa97259bb7f7deb55 (diff) | |
download | qtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz |
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/components/resources')
52 files changed, 153 insertions, 62 deletions
diff --git a/chromium/components/resources/BUILD.gn b/chromium/components/resources/BUILD.gn new file mode 100644 index 00000000000..6f68f8f63b9 --- /dev/null +++ b/chromium/components/resources/BUILD.gn @@ -0,0 +1,43 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//tools/grit/grit_rule.gni") + +# GYP version: components/components_resources.gyp:components_resources +group("resources") { + deps = [ + ":components_resources", + ":components_scaled_resources", + ] +} + +# GYP version: components/components_resources.gyp +# (generate_components_resources action) +grit("components_resources") { + source = "components_resources.grd" + + # TODO(hashimoto): Remove this line. + output_name = "components_resources_new" + outputs = [ + "grit/components_resources.h", + "components_resources.pak", + ] + output_dir = "$root_gen_dir/components" +} + +# GYP version: components/components_resources.gyp +# (generate_scaled_components_resources action) +grit("components_scaled_resources") { + source = "components_scaled_resources.grd" + + # TODO(hashimoto): Remove this line. + output_name = "components_scaled_resources_new" + outputs = [ + "grit/components_scaled_resources.h", + "components_resources_100_percent.pak", + "components_resources_200_percent.pak", + "components_resources_300_percent.pak", + ] + output_dir = "$root_gen_dir/components" +} diff --git a/chromium/components/resources/OWNERS b/chromium/components/resources/OWNERS new file mode 100644 index 00000000000..6b2a1804ab3 --- /dev/null +++ b/chromium/components/resources/OWNERS @@ -0,0 +1,7 @@ +per-file data_reduction_proxy*=bengr@chromium.org +per-file data_reduction_proxy*=sclittle@chromium.org +per-file dom_distiller*=cjhopman@chromium.org +per-file dom_distiller*=nyquist@chromium.org +per-file proximity_auth*=isherman@chromium.org +per-file proximity_auth*=tengs@chromium.org +per-file webui_generator_resources.grdp=dzhioev@chromium.org diff --git a/chromium/components/resources/autofill_scaled_resources.grdp b/chromium/components/resources/autofill_scaled_resources.grdp index e4df87eb4b8..80e5de2a14a 100644 --- a/chromium/components/resources/autofill_scaled_resources.grdp +++ b/chromium/components/resources/autofill_scaled_resources.grdp @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <grit-part> - <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_AMEX" file="common/autofill/amex.png" /> - <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_DINERS" file="common/autofill/diners.png" /> - <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_DISCOVER" file="common/autofill/discover.png" /> - <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_GENERIC" file="common/autofill/cc-generic.png" /> - <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_JCB" file="common/autofill/jcb.png" /> - <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_MASTERCARD" file="common/autofill/mastercard.png" /> - <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_VISA" file="common/autofill/visa.png" /> - <structure type="chrome_scaled_image" name="IDR_AUTOFILL_MAC_CONTACTS_ICON" file="common/autofill/mac_contacts_icon.png" /> + <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_AMEX" file="autofill/amex.png" /> + <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_DISCOVER" file="autofill/discover.png" /> + <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_GENERIC" file="autofill/cc-generic.png" /> + <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_MASTERCARD" file="autofill/mastercard.png" /> + <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_VISA" file="autofill/visa.png" /> + <!-- This is not used on desktop, only Android, so use a placeholder file. --> + <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_SCAN_NEW" file="autofill/cc-generic.png" /> + <structure type="chrome_scaled_image" name="IDR_AUTOFILL_MAC_CONTACTS_ICON" file="autofill/mac_contacts_icon.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_AUTOFILL_CC" file="autofill/infobar_autofill_cc.png" /> </grit-part> diff --git a/chromium/components/resources/components_resources.grd b/chromium/components/resources/components_resources.grd new file mode 100644 index 00000000000..b2ecc7b06af --- /dev/null +++ b/chromium/components/resources/components_resources.grd @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<grit latest_public_release="0" current_release="1"> + <outputs> + <output filename="grit/components_resources.h" type="rc_header"> + <emit emit_type='prepend'></emit> + </output> + <output filename="components_resources.pak" type="data_package" /> + </outputs> + <release seq="1"> + <includes> + <part file="data_reduction_proxy_resources.grdp" /> + <part file="dom_distiller_resources.grdp" /> + <part file="printing_resources.grdp" /> + <part file="proximity_auth_resources.grdp" /> + <part file="translate_resources.grdp" /> + <part file="webui_generator_resources.grdp" /> + </includes> + </release> +</grit> diff --git a/chromium/components/resources/components_scaled_resources.grd b/chromium/components/resources/components_scaled_resources.grd new file mode 100644 index 00000000000..7e58ee00fa8 --- /dev/null +++ b/chromium/components/resources/components_scaled_resources.grd @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<grit latest_public_release="0" current_release="1"> + <outputs> + <output filename="grit/components_scaled_resources.h" type="rc_header" context="default_100_percent"> + <emit emit_type='prepend'></emit> + </output> + <output filename="components_resources_100_percent.pak" type="data_package" context="default_100_percent" /> + <output filename="components_resources_200_percent.pak" type="data_package" context="default_200_percent" /> + <output filename="components_resources_300_percent.pak" type="data_package" context="default_300_percent" /> + </outputs> + <release seq="1"> + <structures fallback_to_low_resolution="true"> + <part file="autofill_scaled_resources.grdp" /> + <part file="omnibox_scaled_resources.grdp" /> + </structures> + </release> +</grit> diff --git a/chromium/components/resources/data_reduction_proxy_resources.grdp b/chromium/components/resources/data_reduction_proxy_resources.grdp new file mode 100644 index 00000000000..1fe6d501684 --- /dev/null +++ b/chromium/components/resources/data_reduction_proxy_resources.grdp @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<grit-part> + <include name="IDR_DATA_REDUCTION_PROXY_INTERSTITIAL_HTML" file="../data_reduction_proxy/content/resources/interstitial.html" flattenhtml="true" type="chrome_html" /> +</grit-part>
\ No newline at end of file diff --git a/chromium/components/resources/default_100_percent/autofill/amex.png b/chromium/components/resources/default_100_percent/autofill/amex.png Binary files differnew file mode 100644 index 00000000000..beb48aa9d25 --- /dev/null +++ b/chromium/components/resources/default_100_percent/autofill/amex.png diff --git a/chromium/components/resources/default_100_percent/autofill/cc-generic.png b/chromium/components/resources/default_100_percent/autofill/cc-generic.png Binary files differnew file mode 100644 index 00000000000..ae80096c962 --- /dev/null +++ b/chromium/components/resources/default_100_percent/autofill/cc-generic.png diff --git a/chromium/components/resources/default_100_percent/autofill/discover.png b/chromium/components/resources/default_100_percent/autofill/discover.png Binary files differnew file mode 100644 index 00000000000..23c1989915d --- /dev/null +++ b/chromium/components/resources/default_100_percent/autofill/discover.png diff --git a/chromium/components/resources/default_100_percent/autofill/infobar_autofill_cc.png b/chromium/components/resources/default_100_percent/autofill/infobar_autofill_cc.png Binary files differnew file mode 100644 index 00000000000..e0f8fc80484 --- /dev/null +++ b/chromium/components/resources/default_100_percent/autofill/infobar_autofill_cc.png diff --git a/chromium/components/resources/default_100_percent/autofill/mac_contacts_icon.png b/chromium/components/resources/default_100_percent/autofill/mac_contacts_icon.png Binary files differnew file mode 100644 index 00000000000..2923c4a193b --- /dev/null +++ b/chromium/components/resources/default_100_percent/autofill/mac_contacts_icon.png diff --git a/chromium/components/resources/default_100_percent/autofill/mastercard.png b/chromium/components/resources/default_100_percent/autofill/mastercard.png Binary files differnew file mode 100644 index 00000000000..1722d66ce43 --- /dev/null +++ b/chromium/components/resources/default_100_percent/autofill/mastercard.png diff --git a/chromium/components/resources/default_100_percent/autofill/visa.png b/chromium/components/resources/default_100_percent/autofill/visa.png Binary files differnew file mode 100644 index 00000000000..694191f5437 --- /dev/null +++ b/chromium/components/resources/default_100_percent/autofill/visa.png diff --git a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_history.png b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_history.png Binary files differnew file mode 100644 index 00000000000..6961084b7c8 --- /dev/null +++ b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_history.png diff --git a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_history_incognito.png b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_history_incognito.png Binary files differnew file mode 100644 index 00000000000..a4ad1d8e082 --- /dev/null +++ b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_history_incognito.png diff --git a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_http.png b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_http.png Binary files differnew file mode 100644 index 00000000000..46a2b64d403 --- /dev/null +++ b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_http.png diff --git a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_http_incognito.png b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_http_incognito.png Binary files differnew file mode 100644 index 00000000000..8e0e9f9e610 --- /dev/null +++ b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_http_incognito.png diff --git a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_search.png b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_search.png Binary files differnew file mode 100644 index 00000000000..d95247dff86 --- /dev/null +++ b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_search.png diff --git a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_search_incognito.png b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_search_incognito.png Binary files differnew file mode 100644 index 00000000000..870eebdb3d1 --- /dev/null +++ b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_search_incognito.png diff --git a/chromium/components/resources/default_100_percent/omnibox/omnibox_calculator.png b/chromium/components/resources/default_100_percent/omnibox/omnibox_calculator.png Binary files differnew file mode 100644 index 00000000000..33dd687ce74 --- /dev/null +++ b/chromium/components/resources/default_100_percent/omnibox/omnibox_calculator.png diff --git a/chromium/components/resources/default_100_percent/omnibox/omnibox_extension_app.png b/chromium/components/resources/default_100_percent/omnibox/omnibox_extension_app.png Binary files differnew file mode 100644 index 00000000000..a5cbcbfc8b1 --- /dev/null +++ b/chromium/components/resources/default_100_percent/omnibox/omnibox_extension_app.png diff --git a/chromium/components/resources/default_100_percent/omnibox/omnibox_http.png b/chromium/components/resources/default_100_percent/omnibox/omnibox_http.png Binary files differnew file mode 100644 index 00000000000..c8031f3b433 --- /dev/null +++ b/chromium/components/resources/default_100_percent/omnibox/omnibox_http.png diff --git a/chromium/components/resources/default_100_percent/omnibox/omnibox_search.png b/chromium/components/resources/default_100_percent/omnibox/omnibox_search.png Binary files differnew file mode 100644 index 00000000000..e271f751a07 --- /dev/null +++ b/chromium/components/resources/default_100_percent/omnibox/omnibox_search.png diff --git a/chromium/components/resources/default_200_percent/autofill/amex.png b/chromium/components/resources/default_200_percent/autofill/amex.png Binary files differnew file mode 100644 index 00000000000..7eec4095546 --- /dev/null +++ b/chromium/components/resources/default_200_percent/autofill/amex.png diff --git a/chromium/components/resources/default_200_percent/autofill/cc-generic.png b/chromium/components/resources/default_200_percent/autofill/cc-generic.png Binary files differnew file mode 100644 index 00000000000..293e89083e2 --- /dev/null +++ b/chromium/components/resources/default_200_percent/autofill/cc-generic.png diff --git a/chromium/components/resources/default_200_percent/autofill/discover.png b/chromium/components/resources/default_200_percent/autofill/discover.png Binary files differnew file mode 100644 index 00000000000..77cb2bebf27 --- /dev/null +++ b/chromium/components/resources/default_200_percent/autofill/discover.png diff --git a/chromium/components/resources/default_200_percent/autofill/infobar_autofill_cc.png b/chromium/components/resources/default_200_percent/autofill/infobar_autofill_cc.png Binary files differnew file mode 100644 index 00000000000..49cffc62537 --- /dev/null +++ b/chromium/components/resources/default_200_percent/autofill/infobar_autofill_cc.png diff --git a/chromium/components/resources/default_200_percent/autofill/mac_contacts_icon.png b/chromium/components/resources/default_200_percent/autofill/mac_contacts_icon.png Binary files differnew file mode 100644 index 00000000000..f0059521863 --- /dev/null +++ b/chromium/components/resources/default_200_percent/autofill/mac_contacts_icon.png diff --git a/chromium/components/resources/default_200_percent/autofill/mastercard.png b/chromium/components/resources/default_200_percent/autofill/mastercard.png Binary files differnew file mode 100644 index 00000000000..db6f823d393 --- /dev/null +++ b/chromium/components/resources/default_200_percent/autofill/mastercard.png diff --git a/chromium/components/resources/default_200_percent/autofill/visa.png b/chromium/components/resources/default_200_percent/autofill/visa.png Binary files differnew file mode 100644 index 00000000000..a7efae9f506 --- /dev/null +++ b/chromium/components/resources/default_200_percent/autofill/visa.png diff --git a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_history.png b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_history.png Binary files differnew file mode 100644 index 00000000000..3e0af58da00 --- /dev/null +++ b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_history.png diff --git a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_history_incognito.png b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_history_incognito.png Binary files differnew file mode 100644 index 00000000000..ce2e4448013 --- /dev/null +++ b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_history_incognito.png diff --git a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_http.png b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_http.png Binary files differnew file mode 100644 index 00000000000..da5ee69ea17 --- /dev/null +++ b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_http.png diff --git a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_http_incognito.png b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_http_incognito.png Binary files differnew file mode 100644 index 00000000000..0d3ff50ae5a --- /dev/null +++ b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_http_incognito.png diff --git a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_search.png b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_search.png Binary files differnew file mode 100644 index 00000000000..f3afeeeb329 --- /dev/null +++ b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_search.png diff --git a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_search_incognito.png b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_search_incognito.png Binary files differnew file mode 100644 index 00000000000..7d26de4c44b --- /dev/null +++ b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_search_incognito.png diff --git a/chromium/components/resources/default_200_percent/omnibox/omnibox_extension_app.png b/chromium/components/resources/default_200_percent/omnibox/omnibox_extension_app.png Binary files differnew file mode 100644 index 00000000000..091a0f9213d --- /dev/null +++ b/chromium/components/resources/default_200_percent/omnibox/omnibox_extension_app.png diff --git a/chromium/components/resources/default_200_percent/omnibox/omnibox_http.png b/chromium/components/resources/default_200_percent/omnibox/omnibox_http.png Binary files differnew file mode 100644 index 00000000000..ebf6b48477c --- /dev/null +++ b/chromium/components/resources/default_200_percent/omnibox/omnibox_http.png diff --git a/chromium/components/resources/default_200_percent/omnibox/omnibox_search.png b/chromium/components/resources/default_200_percent/omnibox/omnibox_search.png Binary files differnew file mode 100644 index 00000000000..46bc10496d7 --- /dev/null +++ b/chromium/components/resources/default_200_percent/omnibox/omnibox_search.png diff --git a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_history.png b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_history.png Binary files differnew file mode 100644 index 00000000000..928aaf7e7b6 --- /dev/null +++ b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_history.png diff --git a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_history_incognito.png b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_history_incognito.png Binary files differnew file mode 100644 index 00000000000..2b36eeb978c --- /dev/null +++ b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_history_incognito.png diff --git a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_http.png b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_http.png Binary files differnew file mode 100644 index 00000000000..bb5a541840d --- /dev/null +++ b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_http.png diff --git a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_http_incognito.png b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_http_incognito.png Binary files differnew file mode 100644 index 00000000000..7f07b76e938 --- /dev/null +++ b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_http_incognito.png diff --git a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_search.png b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_search.png Binary files differnew file mode 100644 index 00000000000..addf19ceaf4 --- /dev/null +++ b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_search.png diff --git a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_search_incognito.png b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_search_incognito.png Binary files differnew file mode 100644 index 00000000000..bfddd2db853 --- /dev/null +++ b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_search_incognito.png diff --git a/chromium/components/resources/default_300_percent/omnibox/omnibox_extension_app.png b/chromium/components/resources/default_300_percent/omnibox/omnibox_extension_app.png Binary files differnew file mode 100644 index 00000000000..ffb68ab5067 --- /dev/null +++ b/chromium/components/resources/default_300_percent/omnibox/omnibox_extension_app.png diff --git a/chromium/components/resources/dom_distiller_resources.grdp b/chromium/components/resources/dom_distiller_resources.grdp index 186bd5ef882..9e81af28255 100644 --- a/chromium/components/resources/dom_distiller_resources.grdp +++ b/chromium/components/resources/dom_distiller_resources.grdp @@ -8,4 +8,6 @@ <include name="IDR_DISTILLER_JS" file="../dom_distiller/core/javascript/domdistiller.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_DISTILLER_CSS" file="../dom_distiller/core/css/distilledpage.css" type="BINDATA" /> <include name="IDR_IS_DISTILLABLE_JS" file="../dom_distiller/core/javascript/is_distillable_trigger.js" type="BINDATA" /> + <include name="IDR_EXTRACT_PAGE_FEATURES_JS" file="../dom_distiller/core/javascript/extract_features.js" type="BINDATA" /> + <include name="IDR_DISTILLABLE_PAGE_SERIALIZED_MODEL" file="../dom_distiller/core/data/distillable_page_model.bin" type="BINDATA" /> </grit-part> diff --git a/chromium/components/resources/omnibox_scaled_resources.grdp b/chromium/components/resources/omnibox_scaled_resources.grdp index 1dc6be44298..901419e8874 100644 --- a/chromium/components/resources/omnibox_scaled_resources.grdp +++ b/chromium/components/resources/omnibox_scaled_resources.grdp @@ -1,6 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <grit-part> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EXTENSION_APP" file="common/omnibox/omnibox_extension_app.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTP" file="common/omnibox/omnibox_http.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_SEARCH" file="common/omnibox/omnibox_search.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CALCULATOR" file="omnibox/omnibox_calculator.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EXTENSION_APP" file="omnibox/omnibox_extension_app.png" /> + <if expr="is_ios"> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HISTORY" file="omnibox/ios/omnibox_history.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HISTORY_INCOGNITO" file="omnibox/ios/omnibox_history_incognito.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTP" file="omnibox/ios/omnibox_http.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTP_INCOGNITO" file="omnibox/ios/omnibox_http_incognito.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_SEARCH" file="omnibox/ios/omnibox_search.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_SEARCH_INCOGNITO" file="omnibox/ios/omnibox_search_incognito.png" /> + </if> + <if expr="not is_ios"> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTP" file="omnibox/omnibox_http.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_SEARCH" file="omnibox/omnibox_search.png" /> + </if> </grit-part> diff --git a/chromium/components/resources/pdf_scaled_resources.grdp b/chromium/components/resources/pdf_scaled_resources.grdp deleted file mode 100644 index 85b2f05a542..00000000000 --- a/chromium/components/resources/pdf_scaled_resources.grdp +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<grit-part> - <if expr="enable_plugins"> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_FTP" file="common/pdf/pdf_button_ftp.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_FTP_HOVER" file="common/pdf/pdf_button_ftp_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_FTP_PRESSED" file="common/pdf/pdf_button_ftp_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_FTW" file="common/pdf/pdf_button_ftw.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_FTW_HOVER" file="common/pdf/pdf_button_ftw_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_FTW_PRESSED" file="common/pdf/pdf_button_ftw_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_ZOOMIN_END" file="common/pdf/pdf_button_zoomin_end.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_ZOOMIN_END_HOVER" file="common/pdf/pdf_button_zoomin_end_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_ZOOMIN_END_PRESSED" file="common/pdf/pdf_button_zoomin_end_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_ZOOMIN" file="common/pdf/pdf_button_zoomin.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_ZOOMIN_HOVER" file="common/pdf/pdf_button_zoomin_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_ZOOMIN_PRESSED" file="common/pdf/pdf_button_zoomin_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_ZOOMOUT" file="common/pdf/pdf_button_zoomout.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_ZOOMOUT_HOVER" file="common/pdf/pdf_button_zoomout_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_ZOOMOUT_PRESSED" file="common/pdf/pdf_button_zoomout_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_SAVE" file="common/pdf/pdf_button_save.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_SAVE_HOVER" file="common/pdf/pdf_button_save_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_SAVE_PRESSED" file="common/pdf/pdf_button_save_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_PRINT" file="common/pdf/pdf_button_print.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_PRINT_HOVER" file="common/pdf/pdf_button_print_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_PRINT_PRESSED" file="common/pdf/pdf_button_print_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_PRINT_DISABLED" file="common/pdf/pdf_button_print_disabled.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_0" file="common/pdf/pdf_thumbnail_0.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_1" file="common/pdf/pdf_thumbnail_1.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_2" file="common/pdf/pdf_thumbnail_2.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_3" file="common/pdf/pdf_thumbnail_3.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_4" file="common/pdf/pdf_thumbnail_4.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_5" file="common/pdf/pdf_thumbnail_5.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_6" file="common/pdf/pdf_thumbnail_6.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_7" file="common/pdf/pdf_thumbnail_7.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_8" file="common/pdf/pdf_thumbnail_8.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_9" file="common/pdf/pdf_thumbnail_9.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_NUM_BACKGROUND" file="common/pdf/pdf_thumbnail_num_background.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_0" file="common/pdf/pdf_progress_0.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_1" file="common/pdf/pdf_progress_1.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_2" file="common/pdf/pdf_progress_2.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_3" file="common/pdf/pdf_progress_3.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_4" file="common/pdf/pdf_progress_4.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_5" file="common/pdf/pdf_progress_5.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_6" file="common/pdf/pdf_progress_6.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_7" file="common/pdf/pdf_progress_7.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_8" file="common/pdf/pdf_progress_8.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_BACKGROUND" file="common/pdf/pdf_progress_background.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_PAGE_INDICATOR_BACKGROUND" file="common/pdf/pdf_page_indicator_background.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_PAGE_DROPSHADOW" file="common/pdf/pdf_dropshadow.png" /> - <structure type="chrome_scaled_image" name="IDR_PDF_PAN_SCROLL_ICON" file="common/pdf/pan_icon.png" /> - </if> -</grit-part> diff --git a/chromium/components/resources/printing_resources.grdp b/chromium/components/resources/printing_resources.grdp new file mode 100644 index 00000000000..7213746453b --- /dev/null +++ b/chromium/components/resources/printing_resources.grdp @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<grit-part> + <if expr="enable_print_preview"> + <include name="IDR_PRINT_PREVIEW_PAGE" file="../printing/resources/print_preview_page.html" flattenhtml="true" allowexternalscript="false" type="BINDATA" /> + </if> +</grit-part> diff --git a/chromium/components/resources/proximity_auth_resources.grdp b/chromium/components/resources/proximity_auth_resources.grdp new file mode 100644 index 00000000000..b2c236e85b2 --- /dev/null +++ b/chromium/components/resources/proximity_auth_resources.grdp @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<grit-part> + <include name="IDR_PROXIMITY_AUTH_UI_HTML" file="../proximity_auth/webui/resources/proximity_auth.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_PROXIMITY_AUTH_UI_CSS" file="../proximity_auth/webui/resources/proximity_auth.css" type="BINDATA" /> + <include name="IDR_PROXIMITY_AUTH_LOG_PANEL_HTML" + file="../proximity_auth/webui/resources/log-panel.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_PROXIMITY_AUTH_LOG_PANEL_JS" + file="../proximity_auth/webui/resources/log-panel.js" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_PROXIMITY_AUTH_CONTENT_PANEL_HTML" + file="../proximity_auth/webui/resources/content-panel.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_PROXIMITY_AUTH_CONTENT_PANEL_JS" + file="../proximity_auth/webui/resources/content-panel.js" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_PROXIMITY_AUTH_LOCAL_STATE_HTML" + file="../proximity_auth/webui/resources/local-state.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_PROXIMITY_AUTH_LOCAL_STATE_JS" + file="../proximity_auth/webui/resources/local-state.js" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_PROXIMITY_AUTH_DEVICE_LIST_HTML" + file="../proximity_auth/webui/resources/device-list.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_PROXIMITY_AUTH_DEVICE_LIST_JS" + file="../proximity_auth/webui/resources/device-list.js" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_PROXIMITY_AUTH_LOG_BUFFER_HTML" + file="../proximity_auth/webui/resources/log-buffer.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_PROXIMITY_AUTH_LOG_BUFFER_JS" + file="../proximity_auth/webui/resources/log-buffer.js" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> +</grit-part> diff --git a/chromium/components/resources/webui_generator_resources.grdp b/chromium/components/resources/webui_generator_resources.grdp new file mode 100644 index 00000000000..996a83feca6 --- /dev/null +++ b/chromium/components/resources/webui_generator_resources.grdp @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<grit-part> + <include name="IDR_WUG_CONTEXT_HTML" file="../webui_generator/resources/context.html" type="chrome_html" /> + <include name="IDR_WUG_CONTEXT_JS" file="../webui_generator/resources/context.js" type="chrome_html" flattenhtml="true" /> + <include name="IDR_WUG_WEBUI_VIEW_HTML" file="../webui_generator/resources/webui-view.html" type="chrome_html" /> + <include name="IDR_WUG_WEBUI_VIEW_JS" file="../webui_generator/resources/webui-view.js" type="chrome_html" /> +</grit-part> |