diff options
Diffstat (limited to 'chromium/components/resources')
28 files changed, 104 insertions, 6 deletions
diff --git a/chromium/components/resources/BUILD.gn b/chromium/components/resources/BUILD.gn index 6f68f8f63b9..388751cf0ba 100644 --- a/chromium/components/resources/BUILD.gn +++ b/chromium/components/resources/BUILD.gn @@ -4,9 +4,11 @@ import("//tools/grit/grit_rule.gni") +about_credits_file = "$target_gen_dir/about_credits.html" + # GYP version: components/components_resources.gyp:components_resources group("resources") { - deps = [ + public_deps = [ ":components_resources", ":components_scaled_resources", ] @@ -24,6 +26,15 @@ grit("components_resources") { "components_resources.pak", ] output_dir = "$root_gen_dir/components" + + grit_flags = [ + "-E", + "about_credits_file=" + rebase_path(about_credits_file, root_build_dir), + ] + + deps = [ + ":about_credits", + ] } # GYP version: components/components_resources.gyp @@ -38,6 +49,31 @@ grit("components_scaled_resources") { "components_resources_100_percent.pak", "components_resources_200_percent.pak", "components_resources_300_percent.pak", + "components_resources_material_100_percent.pak", + "components_resources_material_200_percent.pak", ] output_dir = "$root_gen_dir/components" } + +# GYP version: components/components_resources.gyp:about_credits +action("about_credits") { + script = "//tools/licenses.py" + + inputs = [ + # This is not a complete list. TODO(phajdan.jr, dbeam): licenses.py needs to + # generate a .d file with all the licenses/credits that about:credits uses. + # Then about:credits will automatically rebuild when one of them changes. + # See: depfile in gn's documentation (gn help depfile). + "../about_ui/resources/about_credits.tmpl", + "../about_ui/resources/about_credits_entry.tmpl", + ] + + outputs = [ + about_credits_file, + ] + + args = [ + "credits", + rebase_path(about_credits_file, root_build_dir), + ] +} diff --git a/chromium/components/resources/OWNERS b/chromium/components/resources/OWNERS index 6b2a1804ab3..d38c0de8f2b 100644 --- a/chromium/components/resources/OWNERS +++ b/chromium/components/resources/OWNERS @@ -1,7 +1,8 @@ +per-file autofill_scaled_resources.grdp=estade@chromium.org 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 data_reduction_proxy*=megjablon@chromium.org +per-file dom_distiller*=mdjones@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/about_ui_resources.grdp b/chromium/components/resources/about_ui_resources.grdp new file mode 100644 index 00000000000..28f16fcfaef --- /dev/null +++ b/chromium/components/resources/about_ui_resources.grdp @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<grit-part> + <include name="IDR_ABOUT_UI_CREDITS_HTML" file="${about_credits_file}" use_base_dir="false" type="BINDATA" /> + <include name="IDR_ABOUT_UI_CREDITS_JS" file="../about_ui/resources/about_credits.js" type="BINDATA" /> +</grit-part> diff --git a/chromium/components/resources/autofill_scaled_resources.grdp b/chromium/components/resources/autofill_scaled_resources.grdp index b419e82d539..ec1db8a14cb 100644 --- a/chromium/components/resources/autofill_scaled_resources.grdp +++ b/chromium/components/resources/autofill_scaled_resources.grdp @@ -5,9 +5,16 @@ <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" /> + + <if expr="is_android"> + <!-- These are not used on desktop, only Android, so use a placeholder file. + TODO(rouslan): Remove non-keyboard-accessory icon when keyboard + accessory becomes default on Android. --> + <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_SCAN_NEW" file="autofill/cc-generic.png" /> + <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_SCAN_NEW_KEYBOARD_ACCESSORY" file="autofill/cc-generic.png" /> + <structure type="chrome_scaled_image" name="IDR_AUTOFILL_SETTINGS" file="autofill/cc-generic.png" /> + </if> + <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" /> diff --git a/chromium/components/resources/components_resources.grd b/chromium/components/resources/components_resources.grd index 289e266cd29..a4676e3e4f6 100644 --- a/chromium/components/resources/components_resources.grd +++ b/chromium/components/resources/components_resources.grd @@ -8,10 +8,16 @@ </outputs> <release seq="1"> <includes> + <part file="about_ui_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="printing_resources.grdp" /> <part file="proximity_auth_resources.grdp" /> + <part file="security_interstitials_resources.grdp" /> + <part file="sync_driver_resources.grdp" /> <part file="translate_resources.grdp" /> </includes> </release> diff --git a/chromium/components/resources/components_scaled_resources.grd b/chromium/components/resources/components_scaled_resources.grd index 7e58ee00fa8..fcb9a367f2c 100644 --- a/chromium/components/resources/components_scaled_resources.grd +++ b/chromium/components/resources/components_scaled_resources.grd @@ -7,6 +7,8 @@ <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" /> + <output filename="components_resources_material_100_percent.pak" type="data_package" context="material_100_percent" fallback_to_default_layout="false" /> + <output filename="components_resources_material_200_percent.pak" type="data_package" context="material_200_percent" fallback_to_default_layout="false" /> </outputs> <release seq="1"> <structures fallback_to_low_resolution="true"> 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 differdeleted file mode 100644 index 4e4b06517da..00000000000 --- a/chromium/components/resources/default_100_percent/autofill/mac_contacts_icon.png +++ /dev/null diff --git a/chromium/components/resources/default_100_percent/omnibox/ios/location_bar_http.png b/chromium/components/resources/default_100_percent/omnibox/ios/location_bar_http.png Binary files differnew file mode 100644 index 00000000000..46a2b64d403 --- /dev/null +++ b/chromium/components/resources/default_100_percent/omnibox/ios/location_bar_http.png diff --git a/chromium/components/resources/default_100_percent/omnibox/location_bar_http.png b/chromium/components/resources/default_100_percent/omnibox/location_bar_http.png Binary files differnew file mode 100644 index 00000000000..dd2cf041957 --- /dev/null +++ b/chromium/components/resources/default_100_percent/omnibox/location_bar_http.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 differdeleted file mode 100644 index 7dcb94cbd63..00000000000 --- a/chromium/components/resources/default_200_percent/autofill/mac_contacts_icon.png +++ /dev/null diff --git a/chromium/components/resources/default_200_percent/omnibox/ios/location_bar_http.png b/chromium/components/resources/default_200_percent/omnibox/ios/location_bar_http.png Binary files differnew file mode 100644 index 00000000000..da5ee69ea17 --- /dev/null +++ b/chromium/components/resources/default_200_percent/omnibox/ios/location_bar_http.png diff --git a/chromium/components/resources/default_200_percent/omnibox/location_bar_http.png b/chromium/components/resources/default_200_percent/omnibox/location_bar_http.png Binary files differnew file mode 100644 index 00000000000..12935710699 --- /dev/null +++ b/chromium/components/resources/default_200_percent/omnibox/location_bar_http.png diff --git a/chromium/components/resources/default_300_percent/omnibox/ios/location_bar_http.png b/chromium/components/resources/default_300_percent/omnibox/ios/location_bar_http.png Binary files differnew file mode 100644 index 00000000000..bb5a541840d --- /dev/null +++ b/chromium/components/resources/default_300_percent/omnibox/ios/location_bar_http.png diff --git a/chromium/components/resources/flags_ui_resources.grdp b/chromium/components/resources/flags_ui_resources.grdp new file mode 100644 index 00000000000..f5e599c8fa7 --- /dev/null +++ b/chromium/components/resources/flags_ui_resources.grdp @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<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" /> +</grit-part> diff --git a/chromium/components/resources/gcm_driver_resources.grdp b/chromium/components/resources/gcm_driver_resources.grdp new file mode 100644 index 00000000000..7f89c306ce5 --- /dev/null +++ b/chromium/components/resources/gcm_driver_resources.grdp @@ -0,0 +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_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/location_bar_http.png b/chromium/components/resources/material_100_percent/omnibox/location_bar_http.png Binary files differnew file mode 100644 index 00000000000..6588aef7657 --- /dev/null +++ b/chromium/components/resources/material_100_percent/omnibox/location_bar_http.png 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 differnew file mode 100644 index 00000000000..0ac642c7a35 --- /dev/null +++ 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 differnew file mode 100644 index 00000000000..6588aef7657 --- /dev/null +++ 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 differnew file mode 100644 index 00000000000..af25879a23b --- /dev/null +++ b/chromium/components/resources/material_100_percent/omnibox/omnibox_search.png diff --git a/chromium/components/resources/material_200_percent/omnibox/location_bar_http.png b/chromium/components/resources/material_200_percent/omnibox/location_bar_http.png Binary files differnew file mode 100644 index 00000000000..d6e92192a2f --- /dev/null +++ b/chromium/components/resources/material_200_percent/omnibox/location_bar_http.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 differnew file mode 100644 index 00000000000..865be9368da --- /dev/null +++ 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 differnew file mode 100644 index 00000000000..d6e92192a2f --- /dev/null +++ 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 differnew file mode 100644 index 00000000000..62ab4233389 --- /dev/null +++ b/chromium/components/resources/material_200_percent/omnibox/omnibox_search.png diff --git a/chromium/components/resources/net_log_resources.grdp b/chromium/components/resources/net_log_resources.grdp new file mode 100644 index 00000000000..34e88e4d8bd --- /dev/null +++ b/chromium/components/resources/net_log_resources.grdp @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<grit-part> + <include name="IDR_NET_LOG_NET_EXPORT_HTML" file="../net_log/resources/net_export.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_NET_LOG_NET_EXPORT_JS" file="../net_log/resources/net_export.js" flattenhtml="true" type="BINDATA" /> +</grit-part> diff --git a/chromium/components/resources/omnibox_scaled_resources.grdp b/chromium/components/resources/omnibox_scaled_resources.grdp index 901419e8874..6d34fb93e70 100644 --- a/chromium/components/resources/omnibox_scaled_resources.grdp +++ b/chromium/components/resources/omnibox_scaled_resources.grdp @@ -3,6 +3,7 @@ <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_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" /> @@ -11,6 +12,7 @@ <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_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_SEARCH" file="omnibox/omnibox_search.png" /> </if> diff --git a/chromium/components/resources/proximity_auth_resources.grdp b/chromium/components/resources/proximity_auth_resources.grdp index 805f8d7077b..0c71d061452 100644 --- a/chromium/components/resources/proximity_auth_resources.grdp +++ b/chromium/components/resources/proximity_auth_resources.grdp @@ -26,6 +26,10 @@ file="../proximity_auth/webui/resources/eligible-devices.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_PROXIMITY_AUTH_ELIGIBLE_DEVICES_JS" file="../proximity_auth/webui/resources/eligible-devices.js" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_PROXIMITY_AUTH_REACHABLE_DEVICES_HTML" + file="../proximity_auth/webui/resources/reachable-devices.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_PROXIMITY_AUTH_REACHABLE_DEVICES_JS" + file="../proximity_auth/webui/resources/reachable-devices.js" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_PROXIMITY_AUTH_CRYPTAUTH_INTERFACE_JS" file="../proximity_auth/webui/resources/cryptauth_interface.js" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> </grit-part> diff --git a/chromium/components/resources/security_interstitials_resources.grdp b/chromium/components/resources/security_interstitials_resources.grdp new file mode 100644 index 00000000000..907ef5fe0fc --- /dev/null +++ b/chromium/components/resources/security_interstitials_resources.grdp @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<grit-part> + <include name="IDR_SECURITY_INTERSTITIAL_UI_HTML" file="../security_interstitials/core/browser/resources/interstitial_ui.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_SECURITY_INTERSTITIAL_HTML" file="../security_interstitials/core/browser/resources/interstitial_v2.html" flattenhtml="true" type="BINDATA" /> +</grit-part>
\ No newline at end of file diff --git a/chromium/components/resources/sync_driver_resources.grdp b/chromium/components/resources/sync_driver_resources.grdp new file mode 100644 index 00000000000..bb0caa33546 --- /dev/null +++ b/chromium/components/resources/sync_driver_resources.grdp @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<grit-part> + <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_INDEX_HTML" file="../sync_driver/resources/index.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_INDEX_JS" file="../sync_driver/resources/sync_index.js" type="BINDATA" /> + <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_CHROME_SYNC_JS" file="../sync_driver/resources/chrome_sync.js" type="BINDATA" /> + <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_TYPES_JS" file="../sync_driver/resources/types.js" type="BINDATA" /> + <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_SYNC_LOG_JS" file="../sync_driver/resources/sync_log.js" type="BINDATA" /> + <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_SYNC_NODE_BROWSER_JS" file="../sync_driver/resources/sync_node_browser.js" type="BINDATA" /> + <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_SYNC_SEARCH_JS" file="../sync_driver/resources/sync_search.js" type="BINDATA" /> + <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_ABOUT_JS" file="../sync_driver/resources/about.js" type="BINDATA" /> + <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_DATA_JS" file="../sync_driver/resources/data.js" type="BINDATA" /> + <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_EVENTS_JS" file="../sync_driver/resources/events.js" type="BINDATA" /> + <include name="IDR_SYNC_DRIVER_SYNC_INTERNALS_SEARCH_JS" file="../sync_driver/resources/search.js" type="BINDATA" /> +</grit-part> |
