diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-17 17:24:03 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-06-22 07:51:41 +0000 |
commit | 774f54339e5db91f785733232d3950366db65d07 (patch) | |
tree | 068e1b47bd1af94d77094ed12b604a6b83d9c22a /chromium/components/resources | |
parent | f7eaed5286974984ba5f9e3189d8f49d03e99f81 (diff) | |
download | qtwebengine-chromium-774f54339e5db91f785733232d3950366db65d07.tar.gz |
BASELINE: Update Chromium to 102.0.5005.57
Change-Id: I885f714bb40ee724c28f94ca6bd8dbdb39915158
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/resources')
-rw-r--r-- | chromium/components/resources/OWNERS | 1 | ||||
-rw-r--r-- | chromium/components/resources/autofill_regex_resources.grdp | 4 | ||||
-rw-r--r-- | chromium/components/resources/autofill_scaled_resources.grdp | 2 | ||||
-rw-r--r-- | chromium/components/resources/commerce_heuristics.grdp | 5 | ||||
-rw-r--r-- | chromium/components/resources/components_resources.grd | 4 | ||||
-rw-r--r-- | chromium/components/resources/default_100_percent/chromium/product_logo.png | bin | 2435 -> 1562 bytes | |||
-rw-r--r-- | chromium/components/resources/default_100_percent/chromium/product_logo_white.png | bin | 2094 -> 1417 bytes | |||
-rw-r--r-- | chromium/components/resources/default_200_percent/chromium/product_logo.png | bin | 5278 -> 2714 bytes | |||
-rw-r--r-- | chromium/components/resources/default_200_percent/chromium/product_logo_white.png | bin | 4640 -> 2512 bytes |
9 files changed, 8 insertions, 8 deletions
diff --git a/chromium/components/resources/OWNERS b/chromium/components/resources/OWNERS index c17c7a187aa..d868fd667a6 100644 --- a/chromium/components/resources/OWNERS +++ b/chromium/components/resources/OWNERS @@ -4,7 +4,6 @@ per-file autofill*=file://components/autofill/OWNERS per-file content_suggestions*=file://components/ntp_snippets/OWNERS per-file crash_*=rsesek@chromium.org per-file crash_*=thestig@chromium.org -per-file data_reduction_proxy*=file://components/data_reduction_proxy/OWNERS per-file dom_distiller*=file://components/dom_distiller/OWNERS per-file flags_ui*=file://components/flags_ui/OWNERS per-file gcm_driver_resources.grdp=fgorski@chromium.org diff --git a/chromium/components/resources/autofill_regex_resources.grdp b/chromium/components/resources/autofill_regex_resources.grdp deleted file mode 100644 index 844aaaf24fe..00000000000 --- a/chromium/components/resources/autofill_regex_resources.grdp +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<grit-part> - <include name="IDR_AUTOFILL_REGEX_JSON" file="../autofill/core/browser/pattern_provider/resources/regex_patterns.json" type="BINDATA" compress="brotli" /> -</grit-part> diff --git a/chromium/components/resources/autofill_scaled_resources.grdp b/chromium/components/resources/autofill_scaled_resources.grdp index 7706b257433..56610229335 100644 --- a/chromium/components/resources/autofill_scaled_resources.grdp +++ b/chromium/components/resources/autofill_scaled_resources.grdp @@ -15,11 +15,9 @@ <structure type="chrome_scaled_image" name="IDR_AUTOFILL_VIRTUAL_CARD_ENROLL_DIALOG_DARK" file="autofill/virtual_card_enroll_dark.png" /> <if expr="_google_chrome"> <then> - <structure type="chrome_scaled_image" name="IDR_AUTOFILL_GOOGLE_ISSUED_CARD" file="google_chrome/autofill/googlepay_plex.png" /> <structure type="chrome_scaled_image" name="IDR_AUTOFILL_GOOGLE_PAY" file="google_chrome/autofill/googlepay.png" /> </then> <else> - <structure type="chrome_scaled_image" name="IDR_AUTOFILL_GOOGLE_ISSUED_CARD" file="autofill/cc-generic.png" /> <structure type="chrome_scaled_image" name="IDR_AUTOFILL_GOOGLE_PAY" file="autofill/cc-generic.png" /> </else> </if> diff --git a/chromium/components/resources/commerce_heuristics.grdp b/chromium/components/resources/commerce_heuristics.grdp new file mode 100644 index 00000000000..84fcb43c2fb --- /dev/null +++ b/chromium/components/resources/commerce_heuristics.grdp @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<grit-part> + <include name="IDR_CART_DOMAIN_CART_URL_REGEX_JSON" file="../commerce/core/heuristics/resources/cart_domain_cart_url_regex.json" type="BINDATA" /> + <include name="IDR_CHECKOUT_URL_REGEX_DOMAIN_MAPPING_JSON" file="../commerce/core/heuristics/resources/checkout_url_regex_domain_mapping.json" type="BINDATA"/> +</grit-part> diff --git a/chromium/components/resources/components_resources.grd b/chromium/components/resources/components_resources.grd index 60f6613c51a..276e5d163fa 100644 --- a/chromium/components/resources/components_resources.grd +++ b/chromium/components/resources/components_resources.grd @@ -14,7 +14,6 @@ dev_ui_components_resources.grd. <release seq="1"> <includes> <part file="about_ui_resources.grdp" /> - <part file="autofill_regex_resources.grdp" /> <part file="dom_distiller_resources.grdp" /> <part file="flags_ui_resources.grdp" /> <part file="management_resources.grdp" /> @@ -31,6 +30,9 @@ dev_ui_components_resources.grd. <if expr="is_android"> <part file="android_system_error_page_resources.grdp" /> </if> + <if expr="not is_android"> + <part file="commerce_heuristics.grdp" /> + </if> </includes> </release> </grit> 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 differindex f0c34708c97..7b60bd8c605 100644 --- a/chromium/components/resources/default_100_percent/chromium/product_logo.png +++ b/chromium/components/resources/default_100_percent/chromium/product_logo.png diff --git a/chromium/components/resources/default_100_percent/chromium/product_logo_white.png b/chromium/components/resources/default_100_percent/chromium/product_logo_white.png Binary files differindex 454b33fe2a7..854f414e3d7 100644 --- a/chromium/components/resources/default_100_percent/chromium/product_logo_white.png +++ b/chromium/components/resources/default_100_percent/chromium/product_logo_white.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 differindex 52a636ef93f..876c29223c8 100644 --- a/chromium/components/resources/default_200_percent/chromium/product_logo.png +++ b/chromium/components/resources/default_200_percent/chromium/product_logo.png diff --git a/chromium/components/resources/default_200_percent/chromium/product_logo_white.png b/chromium/components/resources/default_200_percent/chromium/product_logo_white.png Binary files differindex 0cdf603dcd9..fffaf679139 100644 --- a/chromium/components/resources/default_200_percent/chromium/product_logo_white.png +++ b/chromium/components/resources/default_200_percent/chromium/product_logo_white.png |