[DevUI DFM] Move 6 chrome:// pages to DFM, via new dev_ui_content_resources.pak.
This CL moves 29.0 kB of "long tail" resources to the Developer WebUI Dynamic Feature Module (DevUI DFM), for 6 chrome://pages whose resources were in content_resources.pak. The pages moved are: appcache-internals (IDR_APPCACHE_INTERNALS_*) gpu (IDR_GPU_INTERNALS_*) indexeddb-internals (IDR_INDEXED_DB_INTERNALS_*) network-errors (IDR_NETWORK_ERROR_LISTING_*) process-internals (IDR_PROCESS_INTERNALS_*) serviceworker-internals (IDR_SERVICE_WORKER_INTERNALS_*) For chrome://gpu, IDR_VULKAN_* remain in content_resources.pak (and the base module) since they're aliased in shared_resources_data_source.cc. Also rename target //content:resources to //content:content_resources to improve naming consistency. Bug: 927131 Change-Id: Icbc159637e5986438a05de918443ec1fa40d2dce Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1992012 Commit-Queue: Samuel Huang <huangs@chromium.org> Reviewed-by: Jochen Eisinger <jochen@chromium.org> Reviewed-by: Andrew Grieve <agrieve@chromium.org> Cr-Commit-Position: refs/heads/master@{#733258}
This commit is contained in:
Samuel Huang
android_webview
ash/resources
chrome
chromecast
content
BUILD.gn
browser
common
content_resources.grddev_ui_content_resources.grdrenderer
shell
test
extensions
fuchsia/engine
headless
tools/gritsettings
ui/views/examples
weblayer
@ -82,9 +82,7 @@ if (public_android_sdk) {
|
||||
|
||||
android_resource_sizes_test("resource_sizes_system_webview_apk") {
|
||||
apk_name = "SystemWebView"
|
||||
data_deps = [
|
||||
":system_webview_apk",
|
||||
]
|
||||
data_deps = [ ":system_webview_apk" ]
|
||||
}
|
||||
|
||||
# Trichrome WebView APK.
|
||||
@ -344,9 +342,7 @@ generate_jni("browser_jni_headers") {
|
||||
"java/src/org/chromium/android_webview/safe_browsing/AwSafeBrowsingConfigHelper.java",
|
||||
]
|
||||
|
||||
deps = [
|
||||
":cancellation_signal_android_jar_jni_headers",
|
||||
]
|
||||
deps = [ ":cancellation_signal_android_jar_jni_headers" ]
|
||||
}
|
||||
|
||||
generate_jar_jni("cancellation_signal_android_jar_jni_headers") {
|
||||
@ -493,9 +489,7 @@ android_library("browser_java") {
|
||||
}
|
||||
|
||||
android_library("common_variations_utils_java") {
|
||||
sources = [
|
||||
"java/src/org/chromium/android_webview/common/variations/VariationsUtils.java",
|
||||
]
|
||||
sources = [ "java/src/org/chromium/android_webview/common/variations/VariationsUtils.java" ]
|
||||
deps = [
|
||||
"//android_webview/proto:aw_variations_seed_proto_java",
|
||||
"//base:base_java",
|
||||
@ -526,12 +520,8 @@ android_library("common_platform_services_java") {
|
||||
|
||||
# This target compiles the implementation of PlatformServiceBridge for AOSP targets.
|
||||
android_library("platform_service_bridge_upstream_implementation_java") {
|
||||
sources = [
|
||||
"java/src/org/chromium/android_webview/common/PlatformServiceBridgeImpl.java",
|
||||
]
|
||||
deps = [
|
||||
":common_platform_services_java",
|
||||
]
|
||||
sources = [ "java/src/org/chromium/android_webview/common/PlatformServiceBridgeImpl.java" ]
|
||||
deps = [ ":common_platform_services_java" ]
|
||||
}
|
||||
|
||||
android_library("common_crash_java") {
|
||||
@ -594,21 +584,16 @@ generate_product_config_srcjar("webview_product_config") {
|
||||
# level - with the list of pak locales populated by looking at the assets that
|
||||
# are listed in the final APK's .build_config.
|
||||
android_library("android_webview_product_config_java") {
|
||||
sources = [
|
||||
"java/src/org/chromium/android_webview/AwLocaleConfig.java",
|
||||
]
|
||||
sources = [ "java/src/org/chromium/android_webview/AwLocaleConfig.java" ]
|
||||
srcjar_deps = [ ":webview_product_config" ]
|
||||
jar_excluded_patterns = [ "*/ProductConfig.class" ]
|
||||
}
|
||||
|
||||
if (enable_resource_whitelist_generation) {
|
||||
generate_resource_whitelist("system_webview_pak_whitelist") {
|
||||
deps = [
|
||||
":libwebviewchromium",
|
||||
]
|
||||
inputs = [
|
||||
"$root_out_dir/lib.unstripped/libwebviewchromium$shlib_extension",
|
||||
]
|
||||
deps = [ ":libwebviewchromium" ]
|
||||
inputs =
|
||||
[ "$root_out_dir/lib.unstripped/libwebviewchromium$shlib_extension" ]
|
||||
output = system_webview_pak_whitelist
|
||||
}
|
||||
}
|
||||
@ -619,9 +604,7 @@ webview_repack_locales("repack_locales") {
|
||||
|
||||
if (enable_resource_whitelist_generation) {
|
||||
repack_whitelist = system_webview_pak_whitelist
|
||||
deps = [
|
||||
":system_webview_pak_whitelist",
|
||||
]
|
||||
deps = [ ":system_webview_pak_whitelist" ]
|
||||
}
|
||||
}
|
||||
|
||||
@ -634,9 +617,7 @@ android_assets("locale_pak_assets") {
|
||||
renaming_destinations += [ "stored-locales/$_locale.pak" ]
|
||||
}
|
||||
treat_as_locale_paks = true
|
||||
deps = [
|
||||
":repack_locales",
|
||||
]
|
||||
deps = [ ":repack_locales" ]
|
||||
}
|
||||
|
||||
repack("repack_pack") {
|
||||
@ -654,7 +635,7 @@ repack("repack_pack") {
|
||||
":generate_components_resources",
|
||||
":generate_mojo_resources",
|
||||
":generate_webui_resources",
|
||||
"//content:resources",
|
||||
"//content:content_resources",
|
||||
"//net:net_resources",
|
||||
"//third_party/blink/public:resources",
|
||||
]
|
||||
@ -726,20 +707,14 @@ if (android_64bit_target_cpu) {
|
||||
|
||||
android_assets("webview_primary_abi_assets") {
|
||||
if (use_v8_context_snapshot) {
|
||||
deps = [
|
||||
"//tools/v8_context_snapshot:v8_context_snapshot_assets",
|
||||
]
|
||||
deps = [ "//tools/v8_context_snapshot:v8_context_snapshot_assets" ]
|
||||
} else {
|
||||
deps = [
|
||||
"//v8:v8_external_startup_data_assets",
|
||||
]
|
||||
deps = [ "//v8:v8_external_startup_data_assets" ]
|
||||
}
|
||||
}
|
||||
|
||||
android_assets("monochrome_webview_primary_abi_assets") {
|
||||
deps = [
|
||||
"//third_party/icu:icu_assets",
|
||||
]
|
||||
deps = [ "//third_party/icu:icu_assets" ]
|
||||
if (use_v8_context_snapshot) {
|
||||
deps += [ "//tools/v8_context_snapshot:v8_context_snapshot_assets" ]
|
||||
} else {
|
||||
@ -749,15 +724,11 @@ android_assets("monochrome_webview_primary_abi_assets") {
|
||||
|
||||
if (android_64bit_target_cpu) {
|
||||
android_assets("webview_secondary_abi_assets") {
|
||||
deps = [
|
||||
":v8_snapshot_secondary_abi_assets",
|
||||
]
|
||||
deps = [ ":v8_snapshot_secondary_abi_assets" ]
|
||||
}
|
||||
|
||||
android_assets("monochrome_webview_secondary_abi_assets") {
|
||||
deps = [
|
||||
"//third_party/icu:icu_assets",
|
||||
]
|
||||
deps = [ "//third_party/icu:icu_assets" ]
|
||||
deps += [ ":v8_snapshot_secondary_abi_assets" ]
|
||||
}
|
||||
}
|
||||
@ -775,17 +746,13 @@ android_assets("weblayer_webview_assets") {
|
||||
android_assets("stub_assets") {
|
||||
renaming_sources = [ "$root_gen_dir/components/resources/about_credits.html" ]
|
||||
renaming_destinations = [ "webview_licenses.notice" ]
|
||||
deps = [
|
||||
"//components/resources:about_credits",
|
||||
]
|
||||
deps = [ "//components/resources:about_credits" ]
|
||||
}
|
||||
|
||||
android_resources("resources") {
|
||||
resource_dirs = [ "java/res" ]
|
||||
custom_package = "org.chromium.android_webview"
|
||||
deps = [
|
||||
":strings_grd",
|
||||
]
|
||||
deps = [ ":strings_grd" ]
|
||||
}
|
||||
|
||||
grit("generate_aw_resources") {
|
||||
@ -798,9 +765,7 @@ grit("generate_aw_resources") {
|
||||
|
||||
grit("generate_aw_strings") {
|
||||
source = "ui/aw_strings.grd"
|
||||
outputs = [
|
||||
"grit/aw_strings.h",
|
||||
]
|
||||
outputs = [ "grit/aw_strings.h" ]
|
||||
foreach(_locale, locales) {
|
||||
outputs += [ "aw_strings_${_locale}.pak" ]
|
||||
}
|
||||
@ -815,9 +780,7 @@ grit("generate_webui_resources") {
|
||||
# webui/resources has way too many resources. The whitelist is trim this down
|
||||
# to a reasonable size
|
||||
_whitelist = "ui/grit_resources_whitelist.txt"
|
||||
inputs = [
|
||||
_whitelist,
|
||||
]
|
||||
inputs = [ _whitelist ]
|
||||
grit_flags = [
|
||||
"-w",
|
||||
rebase_path(_whitelist, root_build_dir),
|
||||
@ -838,9 +801,7 @@ grit("generate_mojo_resources") {
|
||||
|
||||
# See :generate_webui_resources for an explanation of the whitelist
|
||||
_whitelist = "ui/grit_resources_whitelist.txt"
|
||||
inputs = [
|
||||
_whitelist,
|
||||
]
|
||||
inputs = [ _whitelist ]
|
||||
grit_flags = [
|
||||
"-w",
|
||||
rebase_path(_whitelist, root_build_dir),
|
||||
@ -853,9 +814,7 @@ grit("generate_mojo_resources") {
|
||||
"grit/mojo_bindings_resources_map.h",
|
||||
"mojo_bindings_resources.pak",
|
||||
]
|
||||
deps = [
|
||||
"//mojo/public/js:bindings_lite",
|
||||
]
|
||||
deps = [ "//mojo/public/js:bindings_lite" ]
|
||||
}
|
||||
|
||||
grit("generate_components_resources") {
|
||||
@ -869,9 +828,7 @@ grit("generate_components_resources") {
|
||||
|
||||
# See :generate_webui_resources for an explanation of the whitelist
|
||||
_whitelist = "ui/grit_resources_whitelist.txt"
|
||||
inputs = [
|
||||
_whitelist,
|
||||
]
|
||||
inputs = [ _whitelist ]
|
||||
_about_credits_file = get_label_info("//components/resources",
|
||||
"target_gen_dir") + "/about_credits.html"
|
||||
|
||||
@ -886,9 +843,7 @@ grit("generate_components_resources") {
|
||||
"components_resources.pak",
|
||||
]
|
||||
|
||||
deps = [
|
||||
"//components/resources:about_credits",
|
||||
]
|
||||
deps = [ "//components/resources:about_credits" ]
|
||||
}
|
||||
|
||||
grit("generate_components_strings") {
|
||||
@ -899,9 +854,7 @@ grit("generate_components_strings") {
|
||||
# strings. This whitelist trims about 50% more than the compile-based
|
||||
# whitelist generated by :system_webview_pak_whitelist.
|
||||
whitelist = rebase_path("ui/grit_strings_whitelist.txt", root_build_dir)
|
||||
inputs = [
|
||||
"//android_webview/ui/grit_strings_whitelist.txt",
|
||||
]
|
||||
inputs = [ "//android_webview/ui/grit_strings_whitelist.txt" ]
|
||||
grit_flags = [
|
||||
"-w",
|
||||
whitelist,
|
||||
|
||||
@ -75,11 +75,13 @@ ash_test_resources("with_content_100_percent") {
|
||||
percent = "100"
|
||||
sources = [
|
||||
"$root_gen_dir/content/content_resources.pak",
|
||||
"$root_gen_dir/content/dev_ui_content_resources.pak",
|
||||
"$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_100_percent.pak",
|
||||
"$root_gen_dir/third_party/blink/public/strings/blink_strings_en-US.pak",
|
||||
]
|
||||
deps = [
|
||||
"//content:resources",
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
"//third_party/blink/public:scaled_resources_100_percent",
|
||||
"//third_party/blink/public/strings",
|
||||
]
|
||||
|
||||
@ -420,6 +420,7 @@ repack("dev_ui_paks") {
|
||||
"$root_gen_dir/components/sync_driver_resources.pak",
|
||||
"$root_gen_dir/content/browser/resources/media/media_internals_resources.pak",
|
||||
"$root_gen_dir/content/browser/webrtc/resources/webrtc_internals_resources.pak",
|
||||
"$root_gen_dir/content/dev_ui_content_resources.pak",
|
||||
]
|
||||
deps = [
|
||||
"//chrome/browser:dev_ui_browser_resources",
|
||||
@ -432,6 +433,7 @@ repack("dev_ui_paks") {
|
||||
"//chrome/browser/resources/usb_internals:resources",
|
||||
"//components/resources:dev_ui_components_resources",
|
||||
"//components/sync/driver:resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
"//content/browser/resources/media:media_internals_resources",
|
||||
"//content/browser/webrtc/resources",
|
||||
]
|
||||
|
||||
@ -107,7 +107,7 @@ template("chrome_extra_paks") {
|
||||
"//chrome/common:resources",
|
||||
"//components/autofill/core/browser:autofill_address_rewriter_resources",
|
||||
"//components/resources",
|
||||
"//content:resources",
|
||||
"//content:content_resources",
|
||||
"//content/browser/tracing:resources",
|
||||
"//mojo/public/js:resources",
|
||||
"//net:net_resources",
|
||||
|
||||
@ -481,6 +481,7 @@ repack("cast_shell_pak") {
|
||||
"$root_gen_dir/chromecast/bindings/bindings_resources.pak",
|
||||
"$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
|
||||
"$root_gen_dir/content/content_resources.pak",
|
||||
"$root_gen_dir/content/dev_ui_content_resources.pak",
|
||||
"$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
|
||||
"$root_gen_dir/net/net_resources.pak",
|
||||
"$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
|
||||
@ -497,7 +498,8 @@ repack("cast_shell_pak") {
|
||||
deps = [
|
||||
"//chromecast/app:resources",
|
||||
"//chromecast/bindings:bindings_resources_grit",
|
||||
"//content:resources",
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
"//content/app/resources",
|
||||
"//mojo/public/js:resources",
|
||||
"//net:net_resources",
|
||||
|
||||
@ -108,7 +108,7 @@ if (is_component_build) {
|
||||
}
|
||||
}
|
||||
|
||||
grit("resources") {
|
||||
grit("content_resources") {
|
||||
source = "content_resources.grd"
|
||||
|
||||
# The .grd contains references to generated files.
|
||||
@ -125,12 +125,28 @@ grit("resources") {
|
||||
"root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
|
||||
]
|
||||
deps = [
|
||||
"//content/browser/process_internals:mojo_bindings_js",
|
||||
"//gpu/ipc/common:vulkan_interface_js",
|
||||
"//url/mojom:url_mojom_origin_js",
|
||||
]
|
||||
}
|
||||
|
||||
grit("dev_ui_content_resources") {
|
||||
source = "dev_ui_content_resources.grd"
|
||||
|
||||
# The .grd contains references to generated files.
|
||||
source_is_generated = true
|
||||
|
||||
outputs = [
|
||||
"grit/dev_ui_content_resources.h",
|
||||
"dev_ui_content_resources.pak",
|
||||
]
|
||||
grit_flags = [
|
||||
"-E",
|
||||
"root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
|
||||
]
|
||||
deps = [ "//content/browser/process_internals:mojo_bindings_js" ]
|
||||
}
|
||||
|
||||
# This target exists to "hold" the content_export header so we can do proper
|
||||
# inclusion testing of it.
|
||||
source_set("export") {
|
||||
|
||||
@ -81,7 +81,8 @@ jumbo_source_set("browser") {
|
||||
"//components/viz/client",
|
||||
"//components/viz/common",
|
||||
"//components/viz/host",
|
||||
"//content:resources",
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
"//content/app/resources",
|
||||
"//content/browser/background_fetch:background_fetch_proto",
|
||||
"//content/browser/background_sync:background_sync_proto",
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
#include "content/browser/appcache/appcache.h"
|
||||
#include "content/browser/appcache/appcache_response.h"
|
||||
#include "content/browser/storage_partition_impl.h"
|
||||
#include "content/grit/content_resources.h"
|
||||
#include "content/grit/dev_ui_content_resources.h"
|
||||
#include "content/public/browser/browser_context.h"
|
||||
#include "content/public/browser/browser_task_traits.h"
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
|
||||
@ -28,6 +28,7 @@
|
||||
#include "content/browser/gpu/gpu_data_manager_impl.h"
|
||||
#include "content/browser/gpu/gpu_process_host.h"
|
||||
#include "content/grit/content_resources.h"
|
||||
#include "content/grit/dev_ui_content_resources.h"
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
#include "content/public/browser/content_browser_client.h"
|
||||
#include "content/public/browser/gpu_data_manager_observer.h"
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
#include "base/threading/platform_thread.h"
|
||||
#include "base/values.h"
|
||||
#include "content/browser/indexed_db/indexed_db_context_impl.h"
|
||||
#include "content/grit/content_resources.h"
|
||||
#include "content/grit/dev_ui_content_resources.h"
|
||||
#include "content/public/browser/browser_context.h"
|
||||
#include "content/public/browser/browser_task_traits.h"
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
#include "base/json/json_writer.h"
|
||||
#include "base/memory/ref_counted_memory.h"
|
||||
#include "base/values.h"
|
||||
#include "content/grit/content_resources.h"
|
||||
#include "content/grit/dev_ui_content_resources.h"
|
||||
#include "content/public/browser/web_contents.h"
|
||||
#include "content/public/common/url_constants.h"
|
||||
#include "net/base/net_errors.h"
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
#include "content/browser/frame_host/render_frame_host_impl.h"
|
||||
#include "content/browser/process_internals/process_internals.mojom.h"
|
||||
#include "content/browser/process_internals/process_internals_handler_impl.h"
|
||||
#include "content/grit/content_resources.h"
|
||||
#include "content/grit/dev_ui_content_resources.h"
|
||||
#include "content/public/browser/render_process_host.h"
|
||||
#include "content/public/browser/web_contents.h"
|
||||
#include "content/public/browser/web_ui.h"
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
#include "content/browser/service_worker/service_worker_context_wrapper.h"
|
||||
#include "content/browser/service_worker/service_worker_registration.h"
|
||||
#include "content/browser/service_worker/service_worker_version.h"
|
||||
#include "content/grit/content_resources.h"
|
||||
#include "content/grit/dev_ui_content_resources.h"
|
||||
#include "content/public/browser/browser_context.h"
|
||||
#include "content/public/browser/browser_task_traits.h"
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
|
||||
@ -261,7 +261,8 @@ source_set("common") {
|
||||
"//components/services/filesystem/public/mojom",
|
||||
"//components/tracing",
|
||||
"//components/tracing:startup_tracing",
|
||||
"//content:resources",
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
"//content/app/resources",
|
||||
"//content/common/fetch:fetch_api_request_proto",
|
||||
"//content/public/common:interfaces",
|
||||
|
||||
@ -1,5 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!--
|
||||
This file specifies resources for user-facing features under /content. Resources
|
||||
for developer-facing chrome:// pages should be in dev_ui_content_resources.grd.
|
||||
Other resources that belong in this file:
|
||||
* Aliased resources (see shared_resources_data_source.cc).
|
||||
* (Optional) Resources for non-Android DevUI pages.
|
||||
-->
|
||||
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
|
||||
<outputs>
|
||||
<output filename="grit/content_resources.h" type="rc_header">
|
||||
@ -14,32 +20,14 @@
|
||||
<translations />
|
||||
<release seq="1">
|
||||
<includes>
|
||||
<include name="IDR_APPCACHE_INTERNALS_HTML" file="browser/resources/appcache/appcache_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_APPCACHE_INTERNALS_JS" file="browser/resources/appcache/appcache_internals.js" flattenhtml="false" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_APPCACHE_INTERNALS_CSS" file="browser/resources/appcache/appcache_internals.css" flattenhtml="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_DEVTOOLS_PINCH_CURSOR_ICON" file="browser/resources/devtools/devtools_pinch_cursor.png" type="BINDATA" />
|
||||
<include name="IDR_DEVTOOLS_PINCH_CURSOR_ICON_2X" file="browser/resources/devtools/devtools_pinch_cursor_2x.png" type="BINDATA" />
|
||||
<include name="IDR_DEVTOOLS_TOUCH_CURSOR_ICON" file="browser/resources/devtools/devtools_touch_cursor.png" type="BINDATA" />
|
||||
<include name="IDR_DEVTOOLS_TOUCH_CURSOR_ICON_2X" file="browser/resources/devtools/devtools_touch_cursor_2x.png" type="BINDATA" />
|
||||
<include name="IDR_GPU_INTERNALS_HTML" file="browser/resources/gpu/gpu_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_GPU_INTERNALS_JS" file="browser/resources/gpu/gpu_internals.js" flattenhtml="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_HISTOGRAMS_INTERNALS_HTML" file="browser/resources/histograms/histograms_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_HISTOGRAMS_INTERNALS_JS" file="browser/resources/histograms/histograms_internals.js" flattenhtml="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_INDEXED_DB_INTERNALS_HTML" file="browser/resources/indexed_db/indexeddb_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_INDEXED_DB_INTERNALS_JS" file="browser/resources/indexed_db/indexeddb_internals.js" flattenhtml="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_INDEXED_DB_INTERNALS_CSS" file="browser/resources/indexed_db/indexeddb_internals.css" flattenhtml="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_NETWORK_ERROR_LISTING_HTML" file="browser/resources/net/network_errors_listing.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_NETWORK_ERROR_LISTING_JS" file="browser/resources/net/network_errors_listing.js" flattenhtml="true" type="BINDATA" compress="gzip" />
|
||||
<include name="IDR_NETWORK_ERROR_LISTING_CSS" file="browser/resources/net/network_errors_listing.css" flattenhtml="true" type="BINDATA" compress="gzip" />
|
||||
<include name="IDR_ORIGIN_MOJO_HTML" file="${root_gen_dir}/url/mojom/origin.mojom.html" use_base_dir="false" type="BINDATA" compress="gzip" />
|
||||
<include name="IDR_ORIGIN_MOJO_JS" file="${root_gen_dir}/url/mojom/origin.mojom-lite.js" use_base_dir="false" type="BINDATA" compress="gzip" />
|
||||
<include name="IDR_PROCESS_INTERNALS_HTML" file="browser/resources/process/process_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_PROCESS_INTERNALS_MOJO_JS" file="${root_gen_dir}/content/browser/process_internals/process_internals.mojom-lite.js" use_base_dir="false" type="BINDATA" compress="gzip" />
|
||||
<include name="IDR_PROCESS_INTERNALS_CSS" file="browser/resources/process/process_internals.css" flattenhtml="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_PROCESS_INTERNALS_JS" file="browser/resources/process/process_internals.js" flattenhtml="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_SERVICE_WORKER_INTERNALS_HTML" file="browser/resources/service_worker/serviceworker_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_SERVICE_WORKER_INTERNALS_JS" file="browser/resources/service_worker/serviceworker_internals.js" flattenhtml="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_SERVICE_WORKER_INTERNALS_CSS" file="browser/resources/service_worker/serviceworker_internals.css" flattenhtml="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_UNGUESSABLE_TOKEN_MOJO_HTML" file="${root_gen_dir}/mojo/public/mojom/base/unguessable_token.mojom.html" use_base_dir="false" type="BINDATA" compress="gzip" />
|
||||
<include name="IDR_UNGUESSABLE_TOKEN_MOJO_JS" file="${root_gen_dir}/mojo/public/mojom/base/unguessable_token.mojom-lite.js" use_base_dir="false" type="BINDATA" compress="gzip" />
|
||||
<include name="IDR_URL_MOJO_HTML" file="${root_gen_dir}/url/mojom/url.mojom.html" use_base_dir="false" type="BINDATA" compress="gzip" />
|
||||
|
||||
38
content/dev_ui_content_resources.grd
Normal file
38
content/dev_ui_content_resources.grd
Normal file
@ -0,0 +1,38 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
This file specifies resources for developer-facing chrome:// pages (DevUI pages)
|
||||
under /content. This is needed by the Developer WebUI Dynamic Feature Module
|
||||
(DevUI DFM) for Android Chrome. See content_resources.grd for more examples of
|
||||
files that belong there instead.
|
||||
-->
|
||||
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
|
||||
<outputs>
|
||||
<output filename="grit/dev_ui_content_resources.h" type="rc_header">
|
||||
<emit emit_type='prepend'></emit>
|
||||
</output>
|
||||
<output filename="dev_ui_content_resources.pak" type="data_package" />
|
||||
</outputs>
|
||||
<translations />
|
||||
<release seq="1">
|
||||
<includes>
|
||||
<include name="IDR_APPCACHE_INTERNALS_HTML" file="browser/resources/appcache/appcache_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_APPCACHE_INTERNALS_JS" file="browser/resources/appcache/appcache_internals.js" flattenhtml="false" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_APPCACHE_INTERNALS_CSS" file="browser/resources/appcache/appcache_internals.css" flattenhtml="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_GPU_INTERNALS_HTML" file="browser/resources/gpu/gpu_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_GPU_INTERNALS_JS" file="browser/resources/gpu/gpu_internals.js" flattenhtml="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_INDEXED_DB_INTERNALS_HTML" file="browser/resources/indexed_db/indexeddb_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_INDEXED_DB_INTERNALS_JS" file="browser/resources/indexed_db/indexeddb_internals.js" flattenhtml="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_INDEXED_DB_INTERNALS_CSS" file="browser/resources/indexed_db/indexeddb_internals.css" flattenhtml="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_NETWORK_ERROR_LISTING_HTML" file="browser/resources/net/network_errors_listing.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_NETWORK_ERROR_LISTING_JS" file="browser/resources/net/network_errors_listing.js" flattenhtml="true" type="BINDATA" compress="gzip" />
|
||||
<include name="IDR_NETWORK_ERROR_LISTING_CSS" file="browser/resources/net/network_errors_listing.css" flattenhtml="true" type="BINDATA" compress="gzip" />
|
||||
<include name="IDR_PROCESS_INTERNALS_HTML" file="browser/resources/process/process_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_PROCESS_INTERNALS_MOJO_JS" file="${root_gen_dir}/content/browser/process_internals/process_internals.mojom-lite.js" use_base_dir="false" type="BINDATA" compress="gzip" />
|
||||
<include name="IDR_PROCESS_INTERNALS_CSS" file="browser/resources/process/process_internals.css" flattenhtml="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_PROCESS_INTERNALS_JS" file="browser/resources/process/process_internals.js" flattenhtml="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_SERVICE_WORKER_INTERNALS_HTML" file="browser/resources/service_worker/serviceworker_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_SERVICE_WORKER_INTERNALS_JS" file="browser/resources/service_worker/serviceworker_internals.js" flattenhtml="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_SERVICE_WORKER_INTERNALS_CSS" file="browser/resources/service_worker/serviceworker_internals.css" flattenhtml="true" compress="gzip" type="BINDATA" />
|
||||
</includes>
|
||||
</release>
|
||||
</grit>
|
||||
@ -343,7 +343,8 @@ target(link_target_type, "renderer") {
|
||||
"//components/url_formatter",
|
||||
"//components/viz/client",
|
||||
"//components/viz/common",
|
||||
"//content:resources",
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
"//content/child",
|
||||
"//content/common",
|
||||
"//content/common:buildflags",
|
||||
|
||||
@ -289,7 +289,8 @@ jumbo_static_library("content_shell_lib") {
|
||||
"//components/plugins/renderer",
|
||||
"//components/url_formatter",
|
||||
"//components/web_cache/renderer",
|
||||
"//content:resources",
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
"//content/app/resources",
|
||||
"//content/gpu",
|
||||
"//content/public/common",
|
||||
@ -522,6 +523,7 @@ repack("pak") {
|
||||
"$root_gen_dir/content/browser/tracing/tracing_resources.pak",
|
||||
"$root_gen_dir/content/browser/webrtc/resources/webrtc_internals_resources.pak",
|
||||
"$root_gen_dir/content/content_resources.pak",
|
||||
"$root_gen_dir/content/dev_ui_content_resources.pak",
|
||||
"$root_gen_dir/content/shell/shell_resources.pak",
|
||||
"$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
|
||||
"$root_gen_dir/net/net_resources.pak",
|
||||
@ -536,7 +538,8 @@ repack("pak") {
|
||||
|
||||
deps = [
|
||||
":resources",
|
||||
"//content:resources",
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
"//content/app/resources",
|
||||
"//content/browser/resources/media:media_internals_resources",
|
||||
"//content/browser/tracing:resources",
|
||||
|
||||
@ -1064,6 +1064,11 @@ test("content_browsertests") {
|
||||
"//build/config/compiler:no_size_t_to_int_warning",
|
||||
]
|
||||
|
||||
public_deps = [
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
]
|
||||
|
||||
deps = [
|
||||
":browsertest_support",
|
||||
":content_test_mojo_bindings",
|
||||
@ -1085,7 +1090,6 @@ test("content_browsertests") {
|
||||
"//components/url_formatter:url_formatter",
|
||||
"//components/viz/host",
|
||||
"//components/viz/test:test_support",
|
||||
"//content:resources",
|
||||
"//content/app:both_for_content_tests",
|
||||
"//content/browser:for_content_tests",
|
||||
"//content/browser/background_sync:background_sync_proto",
|
||||
@ -1914,6 +1918,11 @@ test("content_unittests") {
|
||||
|
||||
configs += [ "//build/config:precompiled_headers" ]
|
||||
|
||||
public_deps = [
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
]
|
||||
|
||||
deps = [
|
||||
":content_test_mojo_bindings",
|
||||
":run_all_unittests",
|
||||
@ -1943,7 +1952,6 @@ test("content_unittests") {
|
||||
"//components/viz/host",
|
||||
"//components/viz/service",
|
||||
"//components/viz/test:test_support",
|
||||
"//content:resources",
|
||||
"//content/app:both_for_content_tests",
|
||||
"//content/browser:for_content_tests",
|
||||
"//content/browser/background_fetch:background_fetch_proto",
|
||||
|
||||
@ -162,9 +162,7 @@ jumbo_static_library("test_support") {
|
||||
"//third_party/cld_3/src/src:cld_3",
|
||||
]
|
||||
|
||||
public_deps = [
|
||||
"//content/public/browser",
|
||||
]
|
||||
public_deps = [ "//content/public/browser" ]
|
||||
}
|
||||
|
||||
repack("shell_and_test_pak") {
|
||||
@ -173,6 +171,7 @@ repack("shell_and_test_pak") {
|
||||
sources = [
|
||||
"$root_gen_dir/content/browser/devtools/devtools_resources.pak",
|
||||
"$root_gen_dir/content/content_resources.pak",
|
||||
"$root_gen_dir/content/dev_ui_content_resources.pak",
|
||||
"$root_gen_dir/content/shell/shell_resources.pak",
|
||||
"$root_gen_dir/extensions/extensions_browser_resources_100_percent.pak",
|
||||
"$root_gen_dir/extensions/extensions_renderer_resources.pak",
|
||||
@ -192,7 +191,8 @@ repack("shell_and_test_pak") {
|
||||
|
||||
deps = [
|
||||
":extensions_resources",
|
||||
"//content:resources",
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
"//content/browser/devtools:devtools_resources",
|
||||
"//content/shell:resources",
|
||||
"//extensions/shell:resources",
|
||||
@ -237,9 +237,7 @@ test("extensions_unittests") {
|
||||
"//ui/gl:test_support",
|
||||
]
|
||||
|
||||
data_deps = [
|
||||
"//third_party/mesa_headers",
|
||||
]
|
||||
data_deps = [ "//third_party/mesa_headers" ]
|
||||
}
|
||||
|
||||
test("extensions_browsertests") {
|
||||
@ -256,9 +254,7 @@ test("extensions_browsertests") {
|
||||
"//extensions/shell:browser_tests",
|
||||
]
|
||||
|
||||
data_deps = [
|
||||
"//third_party/mesa_headers",
|
||||
]
|
||||
data_deps = [ "//third_party/mesa_headers" ]
|
||||
}
|
||||
|
||||
# TODO(rockot) bug 505926: These should be moved to extensions_browsertests but have
|
||||
|
||||
@ -253,7 +253,8 @@ jumbo_source_set("renderer") {
|
||||
"//components/guest_view/common",
|
||||
"//components/guest_view/renderer",
|
||||
"//components/version_info",
|
||||
"//content:resources",
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
"//content/public/renderer",
|
||||
"//extensions:extensions_resources",
|
||||
"//extensions/common",
|
||||
|
||||
@ -33,6 +33,7 @@ repack("web_engine_pak") {
|
||||
"$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
|
||||
"$root_gen_dir/content/browser/tracing/tracing_resources.pak",
|
||||
"$root_gen_dir/content/content_resources.pak",
|
||||
"$root_gen_dir/content/dev_ui_content_resources.pak",
|
||||
"$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
|
||||
"$root_gen_dir/net/net_resources.pak",
|
||||
"$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
|
||||
@ -47,7 +48,8 @@ repack("web_engine_pak") {
|
||||
deps = [
|
||||
"//components/resources:components_resources",
|
||||
"//components/strings",
|
||||
"//content:resources",
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
"//content/app/resources",
|
||||
"//content/browser/tracing:resources",
|
||||
"//gpu/command_buffer/service",
|
||||
|
||||
@ -34,6 +34,7 @@ repack("pak") {
|
||||
"$root_gen_dir/content/browser/devtools/devtools_resources.pak",
|
||||
"$root_gen_dir/content/browser/tracing/tracing_resources.pak",
|
||||
"$root_gen_dir/content/content_resources.pak",
|
||||
"$root_gen_dir/content/dev_ui_content_resources.pak",
|
||||
"$root_gen_dir/headless/headless_lib_resources.pak",
|
||||
"$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
|
||||
"$root_gen_dir/net/net_resources.pak",
|
||||
@ -56,7 +57,8 @@ repack("pak") {
|
||||
":resources",
|
||||
"//components/resources:components_resources",
|
||||
"//components/strings",
|
||||
"//content:resources",
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
"//content/app/resources",
|
||||
"//content/browser/devtools:resources",
|
||||
"//content/browser/tracing:resources",
|
||||
|
||||
@ -234,6 +234,9 @@
|
||||
"content/browser/webrtc/resources/resources.grd": {
|
||||
"includes": [2240],
|
||||
},
|
||||
"content/dev_ui_content_resources.grd": {
|
||||
"includes": [2250],
|
||||
},
|
||||
# END chrome/ WebUI resources section
|
||||
|
||||
# START chrome/ miscellaneous section.
|
||||
|
||||
@ -194,7 +194,7 @@ executable("views_examples_with_content_exe") {
|
||||
}
|
||||
|
||||
copy("copy_content_resources") {
|
||||
deps = [ "//content:resources" ]
|
||||
deps = [ "//content:content_resources" ]
|
||||
sources = [ "$root_gen_dir/content/content_resources.pak" ]
|
||||
outputs = [ "$root_out_dir/content_resources.pak" ]
|
||||
}
|
||||
|
||||
@ -213,7 +213,8 @@ jumbo_static_library("weblayer_lib") {
|
||||
"//components/user_prefs",
|
||||
"//components/version_info",
|
||||
"//components/web_cache/browser",
|
||||
"//content:resources",
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
"//content/app/resources",
|
||||
"//content/public/app:both",
|
||||
"//content/public/browser",
|
||||
|
||||
@ -154,6 +154,7 @@ repack("support_pak") {
|
||||
"$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
|
||||
"$root_gen_dir/content/browser/tracing/tracing_resources.pak",
|
||||
"$root_gen_dir/content/content_resources.pak",
|
||||
"$root_gen_dir/content/dev_ui_content_resources.pak",
|
||||
"$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
|
||||
"$root_gen_dir/net/net_resources.pak",
|
||||
"$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
|
||||
@ -169,7 +170,8 @@ repack("support_pak") {
|
||||
deps = [
|
||||
"//components/resources",
|
||||
"//components/strings",
|
||||
"//content:resources",
|
||||
"//content:content_resources",
|
||||
"//content:dev_ui_content_resources",
|
||||
"//content/app/resources",
|
||||
"//content/browser/tracing:resources",
|
||||
"//mojo/public/js:resources",
|
||||
|
||||
Reference in New Issue
Block a user