chromium/src
0
Fork 0
Code Activity

WebUI: Reveal hidden deps to ui/webui/resources.

Browse Source 
The //ui/resources:webui_resources_grd target does not belong under
ui/resources/, since its input file as well as all of its dependencies
are under ui/webui/resources/, which resides in a sibling folder.

Moving it under its proper ui/webui/resources/ folder, makes explicit
what other folders are already depending on ui/webui/resources/, instead
of having such dependencies disguised as pointing to ui/resources/, for
example from sereval ash/webui/ or ios/ targets.

Bug: 385086925
Change-Id: I998fb0ae31a33cd8f09d2af4bd7abf23707aaba6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6096291
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Owners-Override: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Evan Stade <estade@chromium.org>
Reviewed-by: Peter Boström <pbos@chromium.org>
Reviewed-by: Mike Dougherty <michaeldo@chromium.org>
Reviewed-by: Sergio Collazos <sczs@chromium.org>
Reviewed-by: David Dorwin <ddorwin@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1399284}
This commit is contained in:
dpapad
2024-12-20 11:10:37 -08:00
committed by Chromium LUCI CQ
parent 682117cfb3
commit aaac8a0611
59 changed files with 86 additions and 78 deletions

3
ash/resources/BUILD.gn

@ -61,7 +61,7 @@ template("ash_test_resources") {
if (percent == "100") {
sources += [
"$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
"$root_gen_dir/ui/resources/webui_resources.pak",
"$root_gen_dir/ui/webui/resources/webui_resources.pak",
]
}
@ -75,6 +75,7 @@ template("ash_test_resources") {
"//ui/chromeos/resources",
"//ui/resources",
"//ui/views/resources",
"//ui/webui/resources",
]
if (defined(invoker.deps)) {

2
ash/webui/connectivity_diagnostics/BUILD.gn

@ -30,6 +30,6 @@ static_library("connectivity_diagnostics") {
"//chromeos/strings/",
"//content/public/browser",
"//ui/base",
"//ui/resources",
"//ui/webui/resources",
]
}

2
ash/webui/connectivity_diagnostics/connectivity_diagnostics_ui.cc

@ -23,7 +23,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui_data_source.h"
#include "content/public/browser/web_ui_message_handler.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/resources/grit/webui_resources.h"
namespace ash {

2
ash/webui/diagnostics_ui/BUILD.gn

@ -34,9 +34,9 @@ static_library("diagnostics_ui") {
"//content/public/browser",
"//ui/base",
"//ui/chromeos/strings:strings_provider",
"//ui/resources",
"//ui/web_dialogs",
"//ui/webui",
"//ui/webui/resources",
]
}

2
ash/webui/diagnostics_ui/diagnostics_ui.cc

@ -50,8 +50,8 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/chromeos/strings/network/network_element_localized_strings_provider.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/color_change_listener/color_change_handler.h"
#include "ui/webui/resources/grit/webui_resources.h"
namespace ash {

2
ash/webui/firmware_update_ui/BUILD.gn

@ -24,9 +24,9 @@ static_library("firmware_update_ui") {
"//content/public/browser",
"//dbus",
"//ui/chromeos:chromeos",
"//ui/resources:webui_resources_grd_grit",
"//ui/web_dialogs:web_dialogs",
"//ui/webui",
"//ui/webui/resources:resources_grit",
]
}

2
ash/webui/firmware_update_ui/firmware_update_app_ui.cc

@ -26,10 +26,10 @@
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "services/network/public/mojom/content_security_policy.mojom.h"
#include "ui/chromeos/devicetype_utils.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/color_change_listener/color_change_handler.h"
#include "ui/webui/mojo_web_ui_controller.h"
#include "ui/webui/resources/cr_components/color_change_listener/color_change_listener.mojom-forward.h"
#include "ui/webui/resources/grit/webui_resources.h"
namespace ash {

1
ash/webui/graduation/BUILD.gn

@ -40,6 +40,7 @@ static_library("graduation") {
"//content/public/browser",
"//ui/base",
"//ui/webui",
"//ui/webui/resources",
]
}

2
ash/webui/graduation/graduation_ui.cc

@ -35,7 +35,7 @@
#include "content/public/browser/web_ui.h"
#include "content/public/browser/web_ui_data_source.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/resources/grit/webui_resources.h"
#include "url/gurl.h"
#include "url/origin.h"

2
ash/webui/os_feedback_ui/BUILD.gn

@ -27,9 +27,9 @@ static_library("os_feedback_ui") {
"//ash/webui/os_feedback_ui/untrusted_resources:resources",
"//chromeos/strings/",
"//content/public/browser",
"//ui/resources",
"//ui/web_dialogs",
"//ui/webui",
"//ui/webui/resources",
]
}

2
ash/webui/os_feedback_ui/os_feedback_ui.cc

@ -27,10 +27,10 @@
#include "content/public/browser/web_ui_data_source.h"
#include "content/public/common/url_constants.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/web_dialogs/web_dialog_ui.h"
#include "ui/webui/color_change_listener/color_change_handler.h"
#include "ui/webui/mojo_web_ui_controller.h"
#include "ui/webui/resources/grit/webui_resources.h"
#include "ui/webui/webui_allowlist.h"
namespace ash {

2
ash/webui/personalization_app/BUILD.gn

@ -48,8 +48,8 @@ static_library("personalization_app") {
"//content/public/browser",
"//ui/chromeos",
"//ui/chromeos/styles:cros_styles_views",
"//ui/resources:webui_resources_grd_grit",
"//ui/webui",
"//ui/webui/resources:resources_grit",
]
}

2
ash/webui/personalization_app/personalization_app_ui.cc

@ -46,9 +46,9 @@
#include "services/network/public/mojom/content_security_policy.mojom-shared.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/chromeos/devicetype_utils.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/color_change_listener/color_change_handler.h"
#include "ui/webui/mojo_web_ui_controller.h"
#include "ui/webui/resources/grit/webui_resources.h"
namespace ash::personalization_app {

2
ash/webui/print_management/BUILD.gn

@ -25,8 +25,8 @@ static_library("print_management") {
"//chromeos/strings/",
"//content/public/browser",
"//ui/base",
"//ui/resources",
"//ui/webui",
"//ui/webui/resources",
]
}

2
ash/webui/print_management/print_management_ui.cc

@ -26,8 +26,8 @@
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "services/network/public/mojom/content_security_policy.mojom.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/color_change_listener/color_change_handler.h"
#include "ui/webui/resources/grit/webui_resources.h"
namespace ash {
namespace printing {

2
ash/webui/print_preview_cros/BUILD.gn

@ -25,9 +25,9 @@ static_library("print_preview_cros") {
"//content/public/browser",
"//printing/mojom:mojom",
"//ui/base",
"//ui/resources",
"//ui/web_dialogs:web_dialogs",
"//ui/webui",
"//ui/webui/resources",
]
}

2
ash/webui/print_preview_cros/print_preview_cros_ui.cc

@ -23,8 +23,8 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
#include "content/public/browser/web_ui_data_source.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/color_change_listener/color_change_handler.h"
#include "ui/webui/resources/grit/webui_resources.h"
namespace ash::printing::print_preview {

2
ash/webui/sanitize_ui/BUILD.gn

@ -29,9 +29,9 @@ static_library("sanitize_ui") {
"//chromeos/strings/",
"//content/public/browser:browser",
"//ui/base",
"//ui/resources",
"//ui/web_dialogs",
"//ui/webui",
"//ui/webui/resources",
]
}

2
ash/webui/sanitize_ui/sanitize_ui.cc

@ -15,7 +15,7 @@
#include "chromeos/ash/components/install_attributes/install_attributes.h"
#include "chromeos/strings/grit/chromeos_strings.h"
#include "content/public/browser/web_ui_data_source.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/resources/grit/webui_resources.h"
namespace {

2
ash/webui/scanning/BUILD.gn

@ -34,9 +34,9 @@ static_library("scanning") {
"//content/public/browser",
"//ui/base",
"//ui/gfx",
"//ui/resources",
"//ui/shell_dialogs",
"//ui/webui",
"//ui/webui/resources",
]
}

2
ash/webui/scanning/scanning_ui.cc

@ -31,8 +31,8 @@
#include "content/public/browser/web_ui_data_source.h"
#include "services/network/public/mojom/content_security_policy.mojom.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/color_change_listener/color_change_handler.h"
#include "ui/webui/resources/grit/webui_resources.h"
namespace ash {

2
ash/webui/shimless_rma/BUILD.gn

@ -28,7 +28,7 @@ static_library("shimless_rma") {
"//dbus",
"//ui/chromeos:chromeos",
"//ui/chromeos/strings:strings_provider",
"//ui/resources",
"//ui/web_dialogs",
"//ui/webui/resources",
]
}

2
ash/webui/shimless_rma/shimless_rma.cc

@ -31,7 +31,7 @@
#include "services/network/public/mojom/content_security_policy.mojom.h"
#include "ui/chromeos/devicetype_utils.h"
#include "ui/chromeos/strings/network/network_element_localized_strings_provider.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/resources/grit/webui_resources.h"
namespace ash {

2
ash/webui/shortcut_customization_ui/BUILD.gn

@ -34,8 +34,8 @@ static_library("shortcut_customization_ui") {
"//components/keyed_service/content:content",
"//components/user_prefs",
"//content/public/browser",
"//ui/resources:webui_resources_grd_grit",
"//ui/webui",
"//ui/webui/resources:resources_grit",
]
}

2
ash/webui/shortcut_customization_ui/shortcut_customization_app_ui.cc

@ -32,10 +32,10 @@
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "services/network/public/mojom/content_security_policy.mojom.h"
#include "ui/base/ui_base_features.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/views/widget/widget.h"
#include "ui/webui/color_change_listener/color_change_handler.h"
#include "ui/webui/mojo_web_ui_controller.h"
#include "ui/webui/resources/grit/webui_resources.h"
namespace ash {

1
ash/webui/status_area_internals/BUILD.gn

@ -25,6 +25,7 @@ static_library("status_area_internals") {
"//components/prefs:prefs",
"//content/public/browser",
"//ui/webui",
"//ui/webui/resources",
]
}

2
ash/webui/status_area_internals/status_area_internals_ui.cc

@ -22,8 +22,8 @@
#include "content/public/browser/web_ui_data_source.h"
#include "content/public/common/url_constants.h"
#include "ui/base/webui/resource_path.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/mojo_web_ui_controller.h"
#include "ui/webui/resources/grit/webui_resources.h"
namespace ash {

1
chrome/browser/ui/BUILD.gn

@ -5714,6 +5714,7 @@ static_library("ui_public_dependencies") {
"//components/translate/content/browser",
"//content/public/browser",
"//mojo/public/cpp/bindings",
"//ui/webui/resources",
]
if (!is_android) {
public_deps += [

2
chrome/browser/ui/webui/ash/login/BUILD.gn

@ -333,8 +333,8 @@ static_library("login") {
"//ui/chromeos/strings:strings_provider",
"//ui/display",
"//ui/display/manager",
"//ui/resources:webui_resources_grd",
"//ui/strings:ui_strings",
"//ui/webui/resources:resources_grit",
]
allow_circular_includes_from = [

2
chrome/browser/ui/webui/ash/login/oobe_ui.cc

@ -171,8 +171,8 @@
#include "ui/display/screen.h"
#include "ui/events/devices/device_data_manager.h"
#include "ui/events/devices/input_device.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/color_change_listener/color_change_handler.h"
#include "ui/webui/resources/grit/webui_resources.h"
namespace ash {

2
chrome/browser/ui/webui/ash/sys_internals/BUILD.gn

@ -23,6 +23,6 @@ static_library("sys_internals") {
"//content/public/browser",
"//content/public/common",
"//services/network/public/mojom:url_loader_base",
"//ui/resources:webui_resources_grd",
"//ui/webui/resources:resources_grit",
]
}

2
chrome/browser/ui/webui/ash/sys_internals/sys_internals_ui.cc

@ -15,7 +15,7 @@
#include "content/public/browser/web_ui.h"
#include "content/public/browser/web_ui_data_source.h"
#include "services/network/public/mojom/content_security_policy.mojom.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/resources/grit/webui_resources.h"
#include "ui/webui/webui_util.h"
namespace ash {

2
chrome/browser/ui/webui/flags/flags_ui.cc

@ -36,7 +36,7 @@
#include "content/public/browser/web_ui_message_handler.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/resources/grit/webui_resources.h"
#include "ui/webui/webui_util.h"
#if BUILDFLAG(IS_CHROMEOS)

2
chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_ui.cc

@ -24,8 +24,8 @@
#include "content/public/browser/web_ui_data_source.h"
#include "ui/accessibility/accessibility_features.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/views/style/platform_style.h"
#include "ui/webui/resources/grit/webui_resources.h"
#include "ui/webui/webui_util.h"
ReadAnythingUIUntrustedConfig::ReadAnythingUIUntrustedConfig()

2
chrome/browser/ui/webui/signin/dice_web_signin_intercept_ui.cc

@ -22,7 +22,7 @@
#include "ui/base/ui_base_features.h"
#include "ui/base/webui/resource_path.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/resources/grit/webui_resources.h"
#include "ui/webui/webui_util.h"
#include "url/gurl.h"

4
chrome/chrome_paks.gni

@ -132,7 +132,7 @@ template("chrome_extra_paks") {
"$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
"$root_gen_dir/third_party/blink/public/resources/inspector_overlay_resources.pak",
"$root_gen_dir/third_party/blink/public/strings/permission_element_generated_strings.pak",
"$root_gen_dir/ui/resources/webui_resources.pak",
"$root_gen_dir/ui/webui/resources/webui_resources.pak",
]
deps = [
"//base/tracing/protos:chrome_track_event_resources",
@ -150,7 +150,7 @@ template("chrome_extra_paks") {
"//third_party/blink/public:devtools_inspector_resources",
"//third_party/blink/public:resources",
"//third_party/blink/public/strings:permission_element_generated_strings",
"//ui/resources",
"//ui/webui/resources",
]
if (defined(invoker.deps)) {
deps += invoker.deps

2
chrome/test/base/web_ui_test_data_source.cc

@ -18,7 +18,7 @@
#include "content/public/browser/web_ui_data_source.h"
#include "content/public/common/url_constants.h"
#include "services/network/public/mojom/content_security_policy.mojom.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/resources/grit/webui_resources.h"
#include "ui/webui/webui_util.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)

3
chromecast/BUILD.gn

@ -552,10 +552,10 @@ if (!is_fuchsia) {
"$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",
"$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
"$root_gen_dir/ui/resources/webui_resources.pak",
"$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
"$root_gen_dir/ui/strings/ax_strings_en-US.pak",
"$root_gen_dir/ui/strings/ui_strings_en-US.pak",
"$root_gen_dir/ui/webui/resources/webui_resources.pak",
]
output = "$root_out_dir/assets/cast_shell.pak"
@ -573,6 +573,7 @@ if (!is_fuchsia) {
"//third_party/blink/public/strings",
"//ui/resources",
"//ui/strings",
"//ui/webui/resources",
]
}

4
content/DEPS

@ -100,13 +100,13 @@ include_rules = [
"+ui/latency",
"+ui/native_theme",
"+ui/resources/grit/ui_resources.h",
"+ui/resources/grit/webui_resources.h",
"+ui/resources/grit/webui_resources_map.h",
"+ui/shell_dialogs",
"+ui/snapshot",
"+ui/strings/grit/ui_strings.h",
"+ui/surface",
"+ui/touch_selection",
"+ui/webui/resources/grit/webui_resources.h",
"+ui/webui/resources/grit/webui_resources_map.h",
"+ui/wm",
# Content knows about grd files, but the specifics of how to get a resource
# given its id is left to the embedder.

1
content/browser/BUILD.gn

@ -325,6 +325,7 @@ source_set("browser") {
"//ui/strings:auto_image_annotation_strings",
"//ui/strings:ax_strings",
"//ui/touch_selection",
"//ui/webui/resources",
"//v8:v8_version",
]

4
content/browser/webui/shared_resources_data_source.cc

@ -14,8 +14,8 @@
#include "content/public/browser/web_ui_data_source.h"
#include "services/network/public/mojom/content_security_policy.mojom.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/resources/grit/webui_resources_map.h"
#include "ui/webui/resources/grit/webui_resources.h"
#include "ui/webui/resources/grit/webui_resources_map.h"
#if BUILDFLAG(IS_CHROMEOS)
#include "ash/webui/grit/ash_webui_common_resources_map.h"

3
content/shell/BUILD.gn

@ -535,11 +535,11 @@ repack("pak") {
"$root_gen_dir/third_party/blink/public/strings/permission_element_generated_strings.pak",
"$root_gen_dir/third_party/blink/public/strings/permission_element_strings_en-US.pak",
"$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
"$root_gen_dir/ui/resources/webui_resources.pak",
"$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
"$root_gen_dir/ui/strings/auto_image_annotation_strings_en-US.pak",
"$root_gen_dir/ui/strings/ax_strings_en-US.pak",
"$root_gen_dir/ui/strings/ui_strings_en-US.pak",
"$root_gen_dir/ui/webui/resources/webui_resources.pak",
]
deps = [
@ -561,6 +561,7 @@ repack("pak") {
"//third_party/blink/public/strings:permission_element_strings",
"//ui/resources",
"//ui/strings",
"//ui/webui/resources",
]
if (enable_vr) {

4
fuchsia_web/webengine/BUILD.gn

@ -438,8 +438,8 @@ executable("web_engine_exe") {
}
source_set("webui_resources") {
data = [ "$root_gen_dir/ui/resources/webui_resources.pak" ]
deps = [ "//ui/resources" ]
data = [ "$root_gen_dir/ui/webui/resources/webui_resources.pak" ]
deps = [ "//ui/webui/resources:resources_grit" ]
}
_web_engine_excluded_files = [

2
fuchsia_web/webengine/web_engine_main_delegate.cc

@ -35,7 +35,7 @@ void InitializeResources() {
constexpr char kCommonResourcesPakPath[] = "web_engine_common_resources.pak";
constexpr char kWebUiGeneratedResourcesPakPath[] =
"ui/resources/webui_resources.pak";
"ui/webui/resources/webui_resources.pak";
base::FilePath asset_root;
bool result = base::PathService::Get(base::DIR_ASSETS, &asset_root);

3
headless/BUILD.gn

@ -83,7 +83,7 @@ repack("resource_pack_data") {
"$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
"$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_100_percent.pak",
"$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
"$root_gen_dir/ui/resources/webui_resources.pak",
"$root_gen_dir/ui/webui/resources/webui_resources.pak",
]
deps = [
@ -93,6 +93,7 @@ repack("resource_pack_data") {
"//third_party/blink/public:resources",
"//third_party/blink/public:scaled_resources_100_percent",
"//ui/resources",
"//ui/webui/resources",
]
output = "$root_out_dir/headless_lib_data.pak"

4
ios/chrome/app/resources/BUILD.gn

@ -77,7 +77,7 @@ repack("repack_unscaled_resources") {
"$root_gen_dir/ios/web/ios_web_resources.pak",
"$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
"$root_gen_dir/net/net_resources.pak",
"$root_gen_dir/ui/resources/webui_resources.pak",
"$root_gen_dir/ui/webui/resources/webui_resources.pak",
]
deps = [
":ios_resources",
@ -93,7 +93,7 @@ repack("repack_unscaled_resources") {
"//ios/web:resources",
"//mojo/public/js:resources",
"//net:net_resources",
"//ui/resources",
"//ui/webui/resources",
]
output = "$target_gen_dir/resources.pak"

4
ios/web/test/BUILD.gn

@ -17,12 +17,12 @@ repack("packed_resources") {
sources = [
"$root_gen_dir/ios/web/ios_web_resources.pak",
"$root_gen_dir/ios/web/test/test_resources.pak",
"$root_gen_dir/ui/resources/webui_resources.pak",
"$root_gen_dir/ui/webui/resources/webui_resources.pak",
]
deps = [
":resources",
"//ios/web:resources",
"//ui/resources",
"//ui/webui/resources",
]
output = "$target_gen_dir/resources.pak"
copy_data_to_bundle = true

2
ios/web/webui/BUILD.gn

@ -19,7 +19,7 @@ source_set("webui") {
"//mojo/public/js:resources",
"//net",
"//ui/base",
"//ui/resources",
"//ui/webui/resources",
"//url",
]

4
ios/web/webui/shared_resources_data_source_ios.mm

@ -17,8 +17,8 @@
#import "net/base/mime_util.h"
#import "ui/base/webui/resource_path.h"
#import "ui/base/webui/web_ui_util.h"
#import "ui/resources/grit/webui_resources.h"
#import "ui/resources/grit/webui_resources_map.h"
#import "ui/webui/resources/grit/webui_resources.h"
#import "ui/webui/resources/grit/webui_resources_map.h"
namespace web {

4
ios/web_view/BUILD.gn

@ -617,13 +617,13 @@ repack("repack_resources") {
"//components/resources:components_resources",
"//components/sync/service/resources",
"//ios/web:resources",
"//ui/resources",
"//ui/webui/resources",
]
sources = [
"$root_gen_dir/components/components_resources.pak",
"$root_gen_dir/components/sync_service_sync_internals_resources.pak",
"$root_gen_dir/ios/web/ios_web_resources.pak",
"$root_gen_dir/ui/resources/webui_resources.pak",
"$root_gen_dir/ui/webui/resources/webui_resources.pak",
]
output = "$target_gen_dir/web_view_resources.pak"
copy_data_to_bundle = true

2
ui/base/BUILD.gn

@ -507,8 +507,8 @@ component("base") {
"//ui/base/dragdrop/mojom",
"//ui/display",
"//ui/display/util:gpu_info_util",
"//ui/resources:webui_resources_grd",
"//ui/strings",
"//ui/webui/resources:resources_grit",
"//url",
]

2
ui/base/DEPS

@ -15,9 +15,9 @@ include_rules = [
"+ui/gfx",
"+ui/resources/grit/ui_resources.h",
"+ui/resources/grit/ui_unscaled_resources.h",
"+ui/resources/grit/webui_resources.h",
"+ui/strings/grit/app_locale_settings.h",
"+ui/strings/grit/ax_strings.h",
"+ui/strings/grit/ui_strings.h",
"+ui/webui/resources/grit/webui_resources.h",
"+url",
]

2
ui/base/webui/jstemplate_builder.cc

@ -16,7 +16,7 @@
#include "base/strings/string_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/template_expressions.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/resources/grit/webui_resources.h"
namespace webui {

2
ui/base/webui/web_ui_util.cc

@ -28,8 +28,8 @@
#include "ui/base/window_open_disposition_utils.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/font.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/strings/grit/app_locale_settings.h"
#include "ui/webui/resources/grit/webui_resources.h"
#include "url/gurl.h"
#if BUILDFLAG(IS_WIN)

18
ui/resources/BUILD.gn

@ -4,13 +4,11 @@
import("//tools/grit/grit_rule.gni")
import("//tools/grit/repack.gni")
import("//ui/webui/webui_features.gni")
group("resources") {
public_deps = [
":ui_resources_grd",
":ui_unscaled_resources_grd",
":webui_resources_grd",
]
}
@ -34,19 +32,6 @@ grit("ui_unscaled_resources_grd") {
]
}
grit("webui_resources_grd") {
enable_input_discovery_for_gn_analyze = false
source = "$root_gen_dir/ui/webui/resources/webui_resources.grd"
deps = [ "//ui/webui/resources:build_grd" ]
outputs = [
"grit/webui_resources.h",
"grit/webui_resources_map.cc",
"grit/webui_resources_map.h",
"webui_resources.pak",
]
}
if (!is_mac) {
copy("copy_ui_resources_100_percent") {
sources = [ "$root_gen_dir/ui/resources/ui_resources_100_percent.pak" ]
@ -129,10 +114,10 @@ repack("repack_ui_test_pak_100_percent") {
sources = [
"$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
"$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
"$root_gen_dir/ui/resources/webui_resources.pak",
"$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
"$root_gen_dir/ui/strings/ax_strings_en-US.pak",
"$root_gen_dir/ui/strings/ui_strings_en-US.pak",
"$root_gen_dir/ui/webui/resources/webui_resources.pak",
]
output = "$root_out_dir/ui_test.pak"
@ -141,6 +126,7 @@ repack("repack_ui_test_pak_100_percent") {
"//mojo/public/js:resources",
"//ui/resources",
"//ui/strings",
"//ui/webui/resources:resources_grit",
]
if (!is_ios) {

2
ui/webui/BUILD.gn

@ -23,7 +23,7 @@ static_library("webui") {
"//components/content_settings/core/browser",
"//content/public/browser",
"//services/service_manager/public/cpp",
"//ui/resources:webui_resources_grd_grit",
"//ui/webui/resources:resources_grit",
]
public_deps = [

4
ui/webui/examples/BUILD.gn

@ -126,10 +126,10 @@ repack("pak") {
"$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
"$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_100_percent.pak",
"$root_gen_dir/third_party/blink/public/resources/inspector_overlay_resources.pak",
"$root_gen_dir/ui/resources/webui_resources.pak",
"$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
"$root_gen_dir/ui/strings/ui_strings_en-US.pak",
"$root_gen_dir/ui/webui/examples/resources/browser/webui_examples_browser_resources.pak",
"$root_gen_dir/ui/webui/resources/webui_resources.pak",
"$target_gen_dir/webui_examples_resources.pak",
]
deps = [
@ -141,8 +141,8 @@ repack("pak") {
"//third_party/blink/public:devtools_inspector_resources",
"//third_party/blink/public:resources",
"//third_party/blink/public:scaled_resources_100_percent",
"//ui/resources",
"//ui/strings",
"//ui/webui/resources",
]
output = "$root_out_dir/webui_examples.pak"
}

14
ui/webui/resources/BUILD.gn

@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//crypto/features.gni")
import("//tools/grit/grit_rule.gni")
import("//ui/webui/resources/tools/generate_grd.gni")
if (use_blink) {
@ -140,3 +141,16 @@ if (is_chromeos) {
[ "ui/chromeos/styles/cros_styles.css|chromeos/colors/cros_styles.css" ]
}
}
grit("resources") {
enable_input_discovery_for_gn_analyze = false
source = "$target_gen_dir/webui_resources.grd"
deps = [ ":build_grd" ]
outputs = [
"grit/webui_resources.h",
"grit/webui_resources_map.cc",
"grit/webui_resources_map.h",
"webui_resources.pak",
]
}

2
ui/webui/webui_util.cc

@ -17,7 +17,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/ui_base_features.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/resources/grit/webui_resources.h"
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
#include "base/enterprise_util.h"