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/components/resources | |
| 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/components/resources')
32 files changed, 70 insertions, 2 deletions
diff --git a/chromium/components/resources/BUILD.gn b/chromium/components/resources/BUILD.gn index 388751cf0ba..110cde7d29b 100644 --- a/chromium/components/resources/BUILD.gn +++ b/chromium/components/resources/BUILD.gn @@ -46,6 +46,8 @@ grit("components_scaled_resources") { output_name = "components_scaled_resources_new" outputs = [ "grit/components_scaled_resources.h", + "grit/components_scaled_resources_map.cc", + "grit/components_scaled_resources_map.h", "components_resources_100_percent.pak", "components_resources_200_percent.pak", "components_resources_300_percent.pak", diff --git a/chromium/components/resources/OWNERS b/chromium/components/resources/OWNERS index d38c0de8f2b..6311d89a4f8 100644 --- a/chromium/components/resources/OWNERS +++ b/chromium/components/resources/OWNERS @@ -1,8 +1,26 @@ per-file autofill_scaled_resources.grdp=estade@chromium.org +per-file crash_*=cpu@chromium.org +per-file crash_*=jochen@chromium.org +per-file crash_*=mark@chromium.org +per-file crash_*=rsesek@chromium.org +per-file crash_*=scottmg@chromium.org +per-file crash_*=thestig@chromium.org per-file data_reduction_proxy*=bengr@chromium.org -per-file data_reduction_proxy*=sclittle@chromium.org +per-file data_reduction_proxy*=kundaji@chromium.org per-file data_reduction_proxy*=megjablon@chromium.org +per-file data_reduction_proxy*=sclittle@chromium.org +per-file data_reduction_proxy*=tbansal@chromium.org per-file dom_distiller*=mdjones@chromium.org per-file dom_distiller*=nyquist@chromium.org +per-file gcm_driver_resources.grdp=dimich@chromium.org +per-file gcm_driver_resources.grdp=fgorski@chromium.org +per-file gcm_driver_resources.grdp=jianli@chromium.org +per-file gcm_driver_resources.grdp=zea@chromium.org per-file proximity_auth*=isherman@chromium.org per-file proximity_auth*=tengs@chromium.org +per-file version_ui*=bauerb@chromium.org +per-file version_ui*=dbeam@chromium.org +per-file version_ui*=estade@chromium.org +per-file version_ui*=nkostylev@chromium.org +per-file version_ui*=pam@chromium.org +per-file version_ui*=xiyuan@chromium.org diff --git a/chromium/components/resources/autofill_scaled_resources.grdp b/chromium/components/resources/autofill_scaled_resources.grdp index ec1db8a14cb..bc1d884cff3 100644 --- a/chromium/components/resources/autofill_scaled_resources.grdp +++ b/chromium/components/resources/autofill_scaled_resources.grdp @@ -18,4 +18,8 @@ <structure type="chrome_scaled_image" name="IDR_CREDIT_CARD_CVC_HINT" file="autofill/credit_card_cvc_hint.png" /> <structure type="chrome_scaled_image" name="IDR_CREDIT_CARD_CVC_HINT_AMEX" file="autofill/credit_card_cvc_hint_amex.png" /> <structure type="chrome_scaled_image" name="IDR_INFOBAR_AUTOFILL_CC" file="autofill/infobar_autofill_cc.png" /> + <if expr="is_macosx or is_ios"> + <structure type="chrome_scaled_image" name="IDR_AUTOFILL_TOOLTIP_ICON" file="autofill/autofill_tooltip_icon.png" /> + <structure type="chrome_scaled_image" name="IDR_AUTOFILL_TOOLTIP_ICON_H" file="autofill/autofill_tooltip_icon_hover.png" /> + </if> </grit-part> diff --git a/chromium/components/resources/components_resources.grd b/chromium/components/resources/components_resources.grd index a4676e3e4f6..59cc6de2924 100644 --- a/chromium/components/resources/components_resources.grd +++ b/chromium/components/resources/components_resources.grd @@ -9,6 +9,7 @@ <release seq="1"> <includes> <part file="about_ui_resources.grdp" /> + <part file="crash_resources.grdp" /> <part file="data_reduction_proxy_resources.grdp" /> <part file="dom_distiller_resources.grdp" /> <part file="flags_ui_resources.grdp" /> @@ -19,6 +20,7 @@ <part file="security_interstitials_resources.grdp" /> <part file="sync_driver_resources.grdp" /> <part file="translate_resources.grdp" /> + <part file="version_ui_resources.grdp" /> </includes> </release> </grit> diff --git a/chromium/components/resources/components_scaled_resources.grd b/chromium/components/resources/components_scaled_resources.grd index fcb9a367f2c..2cb4e4a7b33 100644 --- a/chromium/components/resources/components_scaled_resources.grd +++ b/chromium/components/resources/components_scaled_resources.grd @@ -4,6 +4,8 @@ <output filename="grit/components_scaled_resources.h" type="rc_header" context="default_100_percent"> <emit emit_type='prepend'></emit> </output> + <output filename="grit/components_scaled_resources_map.cc" type="resource_map_source" context="default_100_percent" /> + <output filename="grit/components_scaled_resources_map.h" type="resource_map_header" context="default_100_percent" /> <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" /> @@ -13,7 +15,10 @@ <release seq="1"> <structures fallback_to_low_resolution="true"> <part file="autofill_scaled_resources.grdp" /> + <part file="crash_scaled_resources.grdp" /> + <part file="flags_ui_scaled_resources.grdp" /> <part file="omnibox_scaled_resources.grdp" /> + <part file="version_ui_scaled_resources.grdp" /> </structures> </release> </grit> diff --git a/chromium/components/resources/crash_resources.grdp b/chromium/components/resources/crash_resources.grdp new file mode 100644 index 00000000000..735b213f310 --- /dev/null +++ b/chromium/components/resources/crash_resources.grdp @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<grit-part> + <include name="IDR_CRASH_CRASHES_HTML" file="../crash/core/browser/resources/crashes.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_CRASH_CRASHES_JS" file="../crash/core/browser/resources/crashes.js" type="BINDATA" /> +</grit-part> diff --git a/chromium/components/resources/crash_scaled_resources.grdp b/chromium/components/resources/crash_scaled_resources.grdp new file mode 100644 index 00000000000..25ddde1b66f --- /dev/null +++ b/chromium/components/resources/crash_scaled_resources.grdp @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<grit-part> + <structure type="chrome_scaled_image" name="IDR_CRASH_SAD_FAVICON" file="crash/favicon_sad_tab.png" /> +</grit-part> diff --git a/chromium/components/resources/default_100_percent/autofill/autofill_tooltip_icon.png b/chromium/components/resources/default_100_percent/autofill/autofill_tooltip_icon.png Binary files differnew file mode 100644 index 00000000000..4434da71fd8 --- /dev/null +++ b/chromium/components/resources/default_100_percent/autofill/autofill_tooltip_icon.png diff --git a/chromium/components/resources/default_100_percent/autofill/autofill_tooltip_icon_hover.png b/chromium/components/resources/default_100_percent/autofill/autofill_tooltip_icon_hover.png Binary files differnew file mode 100644 index 00000000000..893b63d7e4c --- /dev/null +++ b/chromium/components/resources/default_100_percent/autofill/autofill_tooltip_icon_hover.png diff --git a/chromium/components/resources/default_100_percent/chromium/product_logo.png b/chromium/components/resources/default_100_percent/chromium/product_logo.png Binary files differnew file mode 100644 index 00000000000..f0c34708c97 --- /dev/null +++ b/chromium/components/resources/default_100_percent/chromium/product_logo.png diff --git a/chromium/components/resources/default_100_percent/crash/favicon_sad_tab.png b/chromium/components/resources/default_100_percent/crash/favicon_sad_tab.png Binary files differnew file mode 100644 index 00000000000..dcec70d83bf --- /dev/null +++ b/chromium/components/resources/default_100_percent/crash/favicon_sad_tab.png diff --git a/chromium/components/resources/default_100_percent/flags_ui/favicon_flags.png b/chromium/components/resources/default_100_percent/flags_ui/favicon_flags.png Binary files differnew file mode 100644 index 00000000000..b27a223307d --- /dev/null +++ b/chromium/components/resources/default_100_percent/flags_ui/favicon_flags.png diff --git a/chromium/components/resources/default_200_percent/autofill/autofill_tooltip_icon.png b/chromium/components/resources/default_200_percent/autofill/autofill_tooltip_icon.png Binary files differnew file mode 100644 index 00000000000..47322b966c5 --- /dev/null +++ b/chromium/components/resources/default_200_percent/autofill/autofill_tooltip_icon.png diff --git a/chromium/components/resources/default_200_percent/autofill/autofill_tooltip_icon_hover.png b/chromium/components/resources/default_200_percent/autofill/autofill_tooltip_icon_hover.png Binary files differnew file mode 100644 index 00000000000..5d112369861 --- /dev/null +++ b/chromium/components/resources/default_200_percent/autofill/autofill_tooltip_icon_hover.png diff --git a/chromium/components/resources/default_200_percent/chromium/product_logo.png b/chromium/components/resources/default_200_percent/chromium/product_logo.png Binary files differnew file mode 100644 index 00000000000..52a636ef93f --- /dev/null +++ b/chromium/components/resources/default_200_percent/chromium/product_logo.png diff --git a/chromium/components/resources/default_200_percent/crash/favicon_sad_tab.png b/chromium/components/resources/default_200_percent/crash/favicon_sad_tab.png Binary files differnew file mode 100644 index 00000000000..9c434b9cbf3 --- /dev/null +++ b/chromium/components/resources/default_200_percent/crash/favicon_sad_tab.png diff --git a/chromium/components/resources/default_200_percent/flags_ui/favicon_flags.png b/chromium/components/resources/default_200_percent/flags_ui/favicon_flags.png Binary files differnew file mode 100644 index 00000000000..3b3d372290b --- /dev/null +++ b/chromium/components/resources/default_200_percent/flags_ui/favicon_flags.png diff --git a/chromium/components/resources/default_300_percent/crash/favicon_sad_tab.png b/chromium/components/resources/default_300_percent/crash/favicon_sad_tab.png Binary files differnew file mode 100644 index 00000000000..26221c6a94e --- /dev/null +++ b/chromium/components/resources/default_300_percent/crash/favicon_sad_tab.png diff --git a/chromium/components/resources/default_300_percent/flags_ui/favicon_flags.png b/chromium/components/resources/default_300_percent/flags_ui/favicon_flags.png Binary files differnew file mode 100644 index 00000000000..14d85510c2b --- /dev/null +++ b/chromium/components/resources/default_300_percent/flags_ui/favicon_flags.png diff --git a/chromium/components/resources/dom_distiller_resources.grdp b/chromium/components/resources/dom_distiller_resources.grdp index ef5b60938d2..cc1e30eee75 100644 --- a/chromium/components/resources/dom_distiller_resources.grdp +++ b/chromium/components/resources/dom_distiller_resources.grdp @@ -8,7 +8,9 @@ <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_DISTILLER_IOS_CSS" file="../dom_distiller/core/css/distilledpage_ios.css" type="BINDATA" /> + <include name="IDR_DISTILLER_LOADING_IMAGE" file="../dom_distiller/core/images/dom_distiller_material_spinner.svg" 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" /> + <include name="IDR_DISTILLABLE_PAGE_SERIALIZED_MODEL_NEW" file="../dom_distiller/core/data/distillable_page_model_new.bin" type="BINDATA" /> </grit-part> diff --git a/chromium/components/resources/flags_ui_resources.grdp b/chromium/components/resources/flags_ui_resources.grdp index f5e599c8fa7..383f224e528 100644 --- a/chromium/components/resources/flags_ui_resources.grdp +++ b/chromium/components/resources/flags_ui_resources.grdp @@ -2,4 +2,7 @@ <grit-part> <include name="IDR_FLAGS_UI_FLAGS_HTML" file="../flags_ui/resources/flags.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_FLAGS_UI_FLAGS_JS" file="../flags_ui/resources/flags.js" type="BINDATA" /> + <if expr="is_ios"> + <include name="IDR_APPLE_FLAGS_HTML" file="../flags_ui/resources/apple_flags.html" flattenhtml="true" type="BINDATA" /> + </if> </grit-part> diff --git a/chromium/components/resources/flags_ui_scaled_resources.grdp b/chromium/components/resources/flags_ui_scaled_resources.grdp new file mode 100644 index 00000000000..84cc1dcea3a --- /dev/null +++ b/chromium/components/resources/flags_ui_scaled_resources.grdp @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<grit-part> + <structure type="chrome_scaled_image" name="IDR_FLAGS_FAVICON" file="flags_ui/favicon_flags.png" /> +</grit-part> diff --git a/chromium/components/resources/gcm_driver_resources.grdp b/chromium/components/resources/gcm_driver_resources.grdp index 7f89c306ce5..5ab55e32d69 100644 --- a/chromium/components/resources/gcm_driver_resources.grdp +++ b/chromium/components/resources/gcm_driver_resources.grdp @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <grit-part> - <include name="IDR_GCM_DRIVER_GCM_INTERNALS_HTML" file="../gcm_driver/resources/gcm_internals.html" type="BINDATA" /> + <include name="IDR_GCM_DRIVER_GCM_INTERNALS_HTML" file="../gcm_driver/resources/gcm_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_GCM_DRIVER_GCM_INTERNALS_CSS" file="../gcm_driver/resources/gcm_internals.css" type="BINDATA" /> <include name="IDR_GCM_DRIVER_GCM_INTERNALS_JS" file="../gcm_driver/resources/gcm_internals.js" type="BINDATA" /> </grit-part> diff --git a/chromium/components/resources/material_100_percent/omnibox/omnibox_extension_app.png b/chromium/components/resources/material_100_percent/omnibox/omnibox_extension_app.png Binary files differindex 0ac642c7a35..15e67fdcf65 100644 --- a/chromium/components/resources/material_100_percent/omnibox/omnibox_extension_app.png +++ b/chromium/components/resources/material_100_percent/omnibox/omnibox_extension_app.png diff --git a/chromium/components/resources/material_100_percent/omnibox/omnibox_http.png b/chromium/components/resources/material_100_percent/omnibox/omnibox_http.png Binary files differindex 6588aef7657..02e4b58464b 100644 --- a/chromium/components/resources/material_100_percent/omnibox/omnibox_http.png +++ b/chromium/components/resources/material_100_percent/omnibox/omnibox_http.png diff --git a/chromium/components/resources/material_100_percent/omnibox/omnibox_search.png b/chromium/components/resources/material_100_percent/omnibox/omnibox_search.png Binary files differindex af25879a23b..06595a34f6d 100644 --- a/chromium/components/resources/material_100_percent/omnibox/omnibox_search.png +++ b/chromium/components/resources/material_100_percent/omnibox/omnibox_search.png diff --git a/chromium/components/resources/material_200_percent/omnibox/omnibox_extension_app.png b/chromium/components/resources/material_200_percent/omnibox/omnibox_extension_app.png Binary files differindex 865be9368da..0a5ff08c21c 100644 --- a/chromium/components/resources/material_200_percent/omnibox/omnibox_extension_app.png +++ b/chromium/components/resources/material_200_percent/omnibox/omnibox_extension_app.png diff --git a/chromium/components/resources/material_200_percent/omnibox/omnibox_http.png b/chromium/components/resources/material_200_percent/omnibox/omnibox_http.png Binary files differindex d6e92192a2f..7cb45c52a39 100644 --- a/chromium/components/resources/material_200_percent/omnibox/omnibox_http.png +++ b/chromium/components/resources/material_200_percent/omnibox/omnibox_http.png diff --git a/chromium/components/resources/material_200_percent/omnibox/omnibox_search.png b/chromium/components/resources/material_200_percent/omnibox/omnibox_search.png Binary files differindex 62ab4233389..9e1bebe4a8f 100644 --- a/chromium/components/resources/material_200_percent/omnibox/omnibox_search.png +++ b/chromium/components/resources/material_200_percent/omnibox/omnibox_search.png diff --git a/chromium/components/resources/sadtab.svg b/chromium/components/resources/sadtab.svg new file mode 100644 index 00000000000..9ce9ccbebfb --- /dev/null +++ b/chromium/components/resources/sadtab.svg @@ -0,0 +1,4 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48px" viewbox="0 0 48 48" fill="none"> + <path stroke="#5a5a5a" stroke-width="3" stroke-linecap="square" d="M1.5 8.5 v34 h45 v-28 m-3-3 h-10 v-3 m-3-3 h-10 m15 6 h-18 v-3 m-3-3 h-10"/> + <path stroke="#5a5a5a" stroke-width="2" stroke-linecap="square" d="M12 35 h2 m2-2 h12 m2 2 h3 m2 2 h3 M11 21 l0 0 m0 4 h0 m4 0 h0 m0-4 h0 m-2 2 h0 M33 21 l0 0 m0 4 h0 m4 0 h0 m0-4 h0 m-2 2 h0"/> +</svg> diff --git a/chromium/components/resources/version_ui_resources.grdp b/chromium/components/resources/version_ui_resources.grdp new file mode 100644 index 00000000000..c76e74980ac --- /dev/null +++ b/chromium/components/resources/version_ui_resources.grdp @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<grit-part> + <include name="IDR_VERSION_UI_CSS" file="../version_ui/resources/about_version.css" type="BINDATA" /> + <include name="IDR_VERSION_UI_HTML" file="../version_ui/resources/about_version.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_VERSION_UI_JS" file="../version_ui/resources/about_version.js" type="BINDATA" /> +</grit-part> diff --git a/chromium/components/resources/version_ui_scaled_resources.grdp b/chromium/components/resources/version_ui_scaled_resources.grdp new file mode 100644 index 00000000000..06f2a2ba4e9 --- /dev/null +++ b/chromium/components/resources/version_ui_scaled_resources.grdp @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<grit-part> + <if expr="not _google_chrome"> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO" file="chromium/product_logo.png" /> + </if> + <if expr="_google_chrome"> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO" file="google_chrome/product_logo.png" /> + </if> +</grit-part> |
