diff options
Diffstat (limited to 'chromium/components/resources')
36 files changed, 47 insertions, 5 deletions
diff --git a/chromium/components/resources/BUILD.gn b/chromium/components/resources/BUILD.gn index 110cde7d29b..3be6fe9ff48 100644 --- a/chromium/components/resources/BUILD.gn +++ b/chromium/components/resources/BUILD.gn @@ -75,6 +75,7 @@ action("about_credits") { ] args = [ + "--target-os=$target_os", "credits", rebase_path(about_credits_file, root_build_dir), ] diff --git a/chromium/components/resources/OWNERS b/chromium/components/resources/OWNERS index 6311d89a4f8..76b652d670a 100644 --- a/chromium/components/resources/OWNERS +++ b/chromium/components/resources/OWNERS @@ -12,12 +12,20 @@ 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 dom_distiller*=wychen@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=peter@chromium.org per-file gcm_driver_resources.grdp=zea@chromium.org +per-file neterror*=mmenke@chromium.org +per-file neterror*=ttuttle@chromium.org per-file proximity_auth*=isherman@chromium.org per-file proximity_auth*=tengs@chromium.org +per-file supervised_user_error_page.grpd=aberent@chromium.org +per-file supervised_user_error_page.grpd=bauerb@chromium.org +per-file supervised_user_error_page.grpd=pam@chromium.org +per-file supervised_user_error_page.grpd=reib@chromium.org per-file version_ui*=bauerb@chromium.org per-file version_ui*=dbeam@chromium.org per-file version_ui*=estade@chromium.org diff --git a/chromium/components/resources/components_resources.grd b/chromium/components/resources/components_resources.grd index 59cc6de2924..ba428ecb3ab 100644 --- a/chromium/components/resources/components_resources.grd +++ b/chromium/components/resources/components_resources.grd @@ -10,14 +10,16 @@ <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" /> <part file="gcm_driver_resources.grdp" /> <part file="net_log_resources.grdp" /> + <part file="neterror_resources.grdp" /> <part file="printing_resources.grdp" /> <part file="proximity_auth_resources.grdp" /> <part file="security_interstitials_resources.grdp" /> + <part file="signin_resources.grdp" /> + <part file="supervised_user_error_page_resources.grdp" /> <part file="sync_driver_resources.grdp" /> <part file="translate_resources.grdp" /> <part file="version_ui_resources.grdp" /> diff --git a/chromium/components/resources/components_scaled_resources.grd b/chromium/components/resources/components_scaled_resources.grd index 2cb4e4a7b33..5be1c8c0eac 100644 --- a/chromium/components/resources/components_scaled_resources.grd +++ b/chromium/components/resources/components_scaled_resources.grd @@ -17,8 +17,12 @@ <part file="autofill_scaled_resources.grdp" /> <part file="crash_scaled_resources.grdp" /> <part file="flags_ui_scaled_resources.grdp" /> + <part file="neterror_scaled_resources.grdp" /> <part file="omnibox_scaled_resources.grdp" /> <part file="version_ui_scaled_resources.grdp" /> + + <!-- Generic resources --> + <structure type="chrome_scaled_image" name="IDR_HISTORY_FAVICON" file="favicon_history.png" /> </structures> </release> </grit> diff --git a/chromium/components/resources/crash_scaled_resources.grdp b/chromium/components/resources/crash_scaled_resources.grdp index 25ddde1b66f..944c46e726d 100644 --- a/chromium/components/resources/crash_scaled_resources.grdp +++ b/chromium/components/resources/crash_scaled_resources.grdp @@ -1,4 +1,7 @@ <?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" /> + <if expr="is_macosx or is_ios"> + <structure type="chrome_scaled_image" name="IDR_CRASH_SAD_TAB" file="crash/legacy/sadtab.png" /> + </if> </grit-part> diff --git a/chromium/components/resources/data_reduction_proxy_resources.grdp b/chromium/components/resources/data_reduction_proxy_resources.grdp deleted file mode 100644 index 1fe6d501684..00000000000 --- a/chromium/components/resources/data_reduction_proxy_resources.grdp +++ /dev/null @@ -1,4 +0,0 @@ -<?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/crash/legacy/sadtab.png b/chromium/components/resources/default_100_percent/crash/legacy/sadtab.png Binary files differnew file mode 100644 index 00000000000..86f44411944 --- /dev/null +++ b/chromium/components/resources/default_100_percent/crash/legacy/sadtab.png diff --git a/chromium/components/resources/default_100_percent/favicon_history.png b/chromium/components/resources/default_100_percent/favicon_history.png Binary files differnew file mode 100644 index 00000000000..3af97be3ca8 --- /dev/null +++ b/chromium/components/resources/default_100_percent/favicon_history.png diff --git a/chromium/components/resources/default_100_percent/neterror/error_network_generic.png b/chromium/components/resources/default_100_percent/neterror/error_network_generic.png Binary files differnew file mode 100644 index 00000000000..6882db4450e --- /dev/null +++ b/chromium/components/resources/default_100_percent/neterror/error_network_generic.png diff --git a/chromium/components/resources/default_100_percent/omnibox/controlled_setting_mandatory.png b/chromium/components/resources/default_100_percent/omnibox/controlled_setting_mandatory.png Binary files differnew file mode 100644 index 00000000000..5735ead5f59 --- /dev/null +++ b/chromium/components/resources/default_100_percent/omnibox/controlled_setting_mandatory.png diff --git a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_https_invalid.png b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_https_invalid.png Binary files differnew file mode 100644 index 00000000000..bb051b7c4d9 --- /dev/null +++ b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_https_invalid.png diff --git a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_https_valid.png b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_https_valid.png Binary files differnew file mode 100644 index 00000000000..08f5bfa1911 --- /dev/null +++ b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_https_valid.png diff --git a/chromium/components/resources/default_100_percent/omnibox/omnibox_https_invalid.png b/chromium/components/resources/default_100_percent/omnibox/omnibox_https_invalid.png Binary files differnew file mode 100644 index 00000000000..0493dadb8fd --- /dev/null +++ b/chromium/components/resources/default_100_percent/omnibox/omnibox_https_invalid.png diff --git a/chromium/components/resources/default_100_percent/omnibox/omnibox_https_valid.png b/chromium/components/resources/default_100_percent/omnibox/omnibox_https_valid.png Binary files differnew file mode 100644 index 00000000000..dd176c5ca1f --- /dev/null +++ b/chromium/components/resources/default_100_percent/omnibox/omnibox_https_valid.png diff --git a/chromium/components/resources/default_100_percent/omnibox/omnibox_search_button_loupe.png b/chromium/components/resources/default_100_percent/omnibox/omnibox_search_button_loupe.png Binary files differnew file mode 100644 index 00000000000..2b7834cf9fb --- /dev/null +++ b/chromium/components/resources/default_100_percent/omnibox/omnibox_search_button_loupe.png diff --git a/chromium/components/resources/default_200_percent/crash/legacy/sadtab.png b/chromium/components/resources/default_200_percent/crash/legacy/sadtab.png Binary files differnew file mode 100644 index 00000000000..718c94c9658 --- /dev/null +++ b/chromium/components/resources/default_200_percent/crash/legacy/sadtab.png diff --git a/chromium/components/resources/default_200_percent/favicon_history.png b/chromium/components/resources/default_200_percent/favicon_history.png Binary files differnew file mode 100644 index 00000000000..a07ed66eec6 --- /dev/null +++ b/chromium/components/resources/default_200_percent/favicon_history.png diff --git a/chromium/components/resources/default_200_percent/neterror/error_network_generic.png b/chromium/components/resources/default_200_percent/neterror/error_network_generic.png Binary files differnew file mode 100644 index 00000000000..a67b55fec00 --- /dev/null +++ b/chromium/components/resources/default_200_percent/neterror/error_network_generic.png diff --git a/chromium/components/resources/default_200_percent/omnibox/controlled_setting_mandatory.png b/chromium/components/resources/default_200_percent/omnibox/controlled_setting_mandatory.png Binary files differnew file mode 100644 index 00000000000..ae0fee0ffaf --- /dev/null +++ b/chromium/components/resources/default_200_percent/omnibox/controlled_setting_mandatory.png diff --git a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_https_invalid.png b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_https_invalid.png Binary files differnew file mode 100644 index 00000000000..c83bfeeb9e3 --- /dev/null +++ b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_https_invalid.png diff --git a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_https_valid.png b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_https_valid.png Binary files differnew file mode 100644 index 00000000000..f3930e1a04c --- /dev/null +++ b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_https_valid.png diff --git a/chromium/components/resources/default_200_percent/omnibox/omnibox_https_invalid.png b/chromium/components/resources/default_200_percent/omnibox/omnibox_https_invalid.png Binary files differnew file mode 100644 index 00000000000..e36f83363d0 --- /dev/null +++ b/chromium/components/resources/default_200_percent/omnibox/omnibox_https_invalid.png diff --git a/chromium/components/resources/default_200_percent/omnibox/omnibox_https_valid.png b/chromium/components/resources/default_200_percent/omnibox/omnibox_https_valid.png Binary files differnew file mode 100644 index 00000000000..963354bea59 --- /dev/null +++ b/chromium/components/resources/default_200_percent/omnibox/omnibox_https_valid.png diff --git a/chromium/components/resources/default_200_percent/omnibox/omnibox_search_button_loupe.png b/chromium/components/resources/default_200_percent/omnibox/omnibox_search_button_loupe.png Binary files differnew file mode 100644 index 00000000000..21fbe66f2fa --- /dev/null +++ b/chromium/components/resources/default_200_percent/omnibox/omnibox_search_button_loupe.png diff --git a/chromium/components/resources/default_300_percent/favicon_history.png b/chromium/components/resources/default_300_percent/favicon_history.png Binary files differnew file mode 100644 index 00000000000..c4c5886289c --- /dev/null +++ b/chromium/components/resources/default_300_percent/favicon_history.png diff --git a/chromium/components/resources/default_300_percent/omnibox/controlled_setting_mandatory.png b/chromium/components/resources/default_300_percent/omnibox/controlled_setting_mandatory.png Binary files differnew file mode 100644 index 00000000000..b83207eb119 --- /dev/null +++ b/chromium/components/resources/default_300_percent/omnibox/controlled_setting_mandatory.png diff --git a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_https_invalid.png b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_https_invalid.png Binary files differnew file mode 100644 index 00000000000..67dcb1e02da --- /dev/null +++ b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_https_invalid.png diff --git a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_https_valid.png b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_https_valid.png Binary files differnew file mode 100644 index 00000000000..43756f5aacf --- /dev/null +++ b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_https_valid.png diff --git a/chromium/components/resources/dom_distiller_resources.grdp b/chromium/components/resources/dom_distiller_resources.grdp index cc1e30eee75..d340722c1cd 100644 --- a/chromium/components/resources/dom_distiller_resources.grdp +++ b/chromium/components/resources/dom_distiller_resources.grdp @@ -13,4 +13,5 @@ <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" /> + <include name="IDR_LONG_PAGE_SERIALIZED_MODEL" file="../dom_distiller/core/data/long_page_model.bin" type="BINDATA" /> </grit-part> diff --git a/chromium/components/resources/material_100_percent/omnibox/controlled_setting_mandatory.png b/chromium/components/resources/material_100_percent/omnibox/controlled_setting_mandatory.png Binary files differnew file mode 100644 index 00000000000..82ecb9b5128 --- /dev/null +++ b/chromium/components/resources/material_100_percent/omnibox/controlled_setting_mandatory.png diff --git a/chromium/components/resources/material_200_percent/omnibox/controlled_setting_mandatory.png b/chromium/components/resources/material_200_percent/omnibox/controlled_setting_mandatory.png Binary files differnew file mode 100644 index 00000000000..25ab9ddb465 --- /dev/null +++ b/chromium/components/resources/material_200_percent/omnibox/controlled_setting_mandatory.png diff --git a/chromium/components/resources/neterror_resources.grdp b/chromium/components/resources/neterror_resources.grdp new file mode 100644 index 00000000000..298f85acadb --- /dev/null +++ b/chromium/components/resources/neterror_resources.grdp @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<grit-part> + <include name="IDR_NET_ERROR_HTML" file="../neterror/resources/neterror.html" flattenhtml="true" type="BINDATA" /> +</grit-part> diff --git a/chromium/components/resources/neterror_scaled_resources.grdp b/chromium/components/resources/neterror_scaled_resources.grdp new file mode 100644 index 00000000000..1e2cad3e691 --- /dev/null +++ b/chromium/components/resources/neterror_scaled_resources.grdp @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<grit-part> + <structure type="chrome_scaled_image" name="IDR_ERROR_NETWORK_GENERIC" file="neterror/error_network_generic.png" /> +</grit-part> diff --git a/chromium/components/resources/omnibox_scaled_resources.grdp b/chromium/components/resources/omnibox_scaled_resources.grdp index 6d34fb93e70..46a18f3b46b 100644 --- a/chromium/components/resources/omnibox_scaled_resources.grdp +++ b/chromium/components/resources/omnibox_scaled_resources.grdp @@ -2,11 +2,15 @@ <grit-part> <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" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTPS_POLICY_WARNING" file="omnibox/controlled_setting_mandatory.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_SEARCH_BUTTON_LOUPE" file="omnibox/omnibox_search_button_loupe.png" /> <if expr="is_ios"> <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_HTTP" file="omnibox/ios/location_bar_http.png" /> <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_HTTPS_INVALID" file="omnibox/ios/omnibox_https_invalid.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTPS_VALID" file="omnibox/ios/omnibox_https_valid.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" /> @@ -14,6 +18,8 @@ <if expr="not is_ios"> <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_HTTP" file="omnibox/location_bar_http.png" /> <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTP" file="omnibox/omnibox_http.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTPS_INVALID" file="omnibox/omnibox_https_invalid.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTPS_VALID" file="omnibox/omnibox_https_valid.png" /> <structure type="chrome_scaled_image" name="IDR_OMNIBOX_SEARCH" file="omnibox/omnibox_search.png" /> </if> </grit-part> diff --git a/chromium/components/resources/signin_resources.grdp b/chromium/components/resources/signin_resources.grdp new file mode 100644 index 00000000000..37fe757b24a --- /dev/null +++ b/chromium/components/resources/signin_resources.grdp @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<grit-part> + <include name="IDR_SIGNIN_INTERNALS_INDEX_HTML" + file="../signin/core/browser/resources/signin_index.html" + flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_SIGNIN_INTERNALS_INDEX_JS" + file="../signin/core/browser/resources/signin_internals.js" + type="BINDATA" /> +</grit-part> diff --git a/chromium/components/resources/supervised_user_error_page_resources.grdp b/chromium/components/resources/supervised_user_error_page_resources.grdp new file mode 100644 index 00000000000..b9c9577b2cc --- /dev/null +++ b/chromium/components/resources/supervised_user_error_page_resources.grdp @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<grit-part> + <include name="IDR_SUPERVISED_USER_BLOCK_INTERSTITIAL_HTML" file="../supervised_user_error_page/resources/supervised_user_block_interstitial.html" flattenhtml="true" type="BINDATA" /> +</grit-part> |