0

Cleanup: Rename webui_generated_resources_* to webui_resources_*.

The "webui_generated_" prefix made sense when there were both
1) a checked in webui_resources.grd file
2) a generated webui_generated_resources.grd file

And there was a need to differentiate between the two files and their
corresponding Grit C++ generated files. The checked-in
webui_resources.grd file has been deleted since crrev.com/c/3577218, and
the distinction is no longer needed. Removing it to reduce clutter.

Bug: None
Change-Id: I427d3e3d982185b988ed8ad132f487b2541a7fbe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4113994
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: Sergio Collazos <sczs@chromium.org>
Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Reviewed-by: Nate Fischer <ntfschr@chromium.org>
Reviewed-by: Yuchen Liu <yucliu@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Evan Stade <estade@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1085172}
This commit is contained in:
dpapad
2022-12-19 22:55:05 +00:00
committed by Chromium LUCI CQ
parent c58d021e9e
commit ef4455cc26
61 changed files with 98 additions and 112 deletions
android_webview
ash
chrome
chromecast
content
fuchsia_web/webengine
headless
ios
tools/gritsettings
ui
weblayer/shell

@ -896,7 +896,7 @@ repack("repack_pack") {
"$root_gen_dir/third_party/blink/public/resources/inspector_overlay_resources.pak",
"$target_gen_dir/components_resources.pak",
"$target_gen_dir/mojo_bindings_resources.pak",
"$target_gen_dir/webui_generated_resources.pak",
"$target_gen_dir/webui_resources.pak",
]
deps = [
":generate_components_resources",
@ -1045,14 +1045,14 @@ grit("generate_webui_resources") {
enable_input_discovery_for_gn_analyze = false
defines =
[ "SHARED_INTERMEDIATE_DIR=" + rebase_path(root_gen_dir, root_build_dir) ]
source = "$root_gen_dir/ui/webui/resources/webui_generated_resources.grd"
source = "$root_gen_dir/ui/webui/resources/webui_resources.grd"
deps = [ "//ui/webui/resources:build_grd" ]
outputs = [
"grit/webui_generated_resources.h",
"grit/webui_generated_resources_map.cc",
"grit/webui_generated_resources_map.h",
"webui_generated_resources.pak",
"grit/webui_resources.h",
"grit/webui_resources_map.cc",
"grit/webui_resources_map.h",
"webui_resources.pak",
]
# webui/resources has way too many resources. The allowlist is trim this down

@ -44,7 +44,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_generated_resources.pak",
"$root_gen_dir/ui/resources/webui_resources.pak",
]
}

@ -17,7 +17,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_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
namespace ash {
@ -30,8 +30,7 @@ void SetUpWebUIDataSource(content::WebUIDataSource* source,
int default_resource) {
source->AddResourcePaths(resources);
source->SetDefaultResource(default_resource);
source->AddResourcePath("test_loader.html",
IDR_WEBUI_GENERATED_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.html", IDR_WEBUI_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.js", IDR_WEBUI_JS_TEST_LOADER_JS);
source->AddResourcePath("test_loader_util.js",
IDR_WEBUI_JS_TEST_LOADER_UTIL_JS);

@ -43,7 +43,7 @@
#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_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
namespace ash {
@ -371,8 +371,7 @@ void SetUpWebUIDataSource(content::WebUIDataSource* source,
int default_resource) {
source->AddResourcePaths(resources);
source->AddResourcePath("", default_resource);
source->AddResourcePath("test_loader.html",
IDR_WEBUI_GENERATED_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.html", IDR_WEBUI_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.js", IDR_WEBUI_JS_TEST_LOADER_JS);
source->AddResourcePath("test_loader_util.js",
IDR_WEBUI_JS_TEST_LOADER_UTIL_JS);

@ -22,7 +22,7 @@ static_library("firmware_update_ui") {
"//chromeos/strings/",
"//content/public/browser",
"//dbus",
"//ui/resources:webui_generated_resources_grd_grit",
"//ui/resources:webui_resources_grd_grit",
"//ui/web_dialogs:web_dialogs",
"//ui/webui",
]

@ -19,7 +19,7 @@
#include "content/public/browser/web_ui_data_source.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "services/network/public/mojom/content_security_policy.mojom.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/mojo_web_ui_controller.h"
namespace ash {
@ -31,8 +31,7 @@ void SetUpWebUIDataSource(content::WebUIDataSource* source,
int default_resource) {
source->AddResourcePaths(resources);
source->SetDefaultResource(default_resource);
source->AddResourcePath("test_loader.html",
IDR_WEBUI_GENERATED_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.html", IDR_WEBUI_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.js", IDR_WEBUI_JS_TEST_LOADER_JS);
source->AddResourcePath("test_loader_util.js",
IDR_WEBUI_JS_TEST_LOADER_UTIL_JS);

@ -58,7 +58,7 @@ static_library("help_app_ui") {
"//content/public/common",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/platform",
"//ui/resources:webui_generated_resources_grd_grit",
"//ui/resources:webui_resources_grd_grit",
"//ui/webui",
]
}

@ -17,7 +17,7 @@ source_set("network_diagnostics_resource_provider") {
"//chromeos/strings/",
"//content/public/browser",
"//ui/base",
"//ui/resources:webui_generated_resources_grd_grit",
"//ui/resources:webui_resources_grd_grit",
]
}
@ -31,7 +31,7 @@ source_set("network_health_resource_provider") {
"//chromeos/strings/",
"//content/public/browser",
"//ui/base",
"//ui/resources:webui_generated_resources_grd_grit",
"//ui/resources:webui_resources_grd_grit",
]
}
@ -46,6 +46,6 @@ source_set("traffic_counters_resource_provider") {
"//chromeos/strings/",
"//content/public/browser",
"//ui/base",
"//ui/resources:webui_generated_resources_grd_grit",
"//ui/resources:webui_resources_grd_grit",
]
}

@ -8,7 +8,7 @@
#include "chromeos/strings/grit/chromeos_strings.h"
#include "content/public/browser/web_ui_data_source.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
namespace ash {
namespace network_diagnostics {

@ -7,7 +7,7 @@
#include "chromeos/strings/grit/chromeos_strings.h"
#include "content/public/browser/web_ui_data_source.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
namespace ash {
namespace network_health {

@ -8,7 +8,7 @@
#include "chromeos/strings/grit/chromeos_strings.h"
#include "content/public/browser/web_ui_data_source.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
namespace ash {
namespace traffic_counters {

@ -20,7 +20,7 @@
#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_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/mojo_web_ui_controller.h"
#include "ui/webui/webui_allowlist.h"
@ -33,8 +33,7 @@ void SetUpWebUIDataSource(content::WebUIDataSource* source,
int default_resource) {
source->AddResourcePaths(resources);
source->SetDefaultResource(default_resource);
source->AddResourcePath("test_loader.html",
IDR_WEBUI_GENERATED_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.html", IDR_WEBUI_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.js", IDR_WEBUI_JS_TEST_LOADER_JS);
source->AddResourcePath("test_loader_util.js",
IDR_WEBUI_JS_TEST_LOADER_UTIL_JS);

@ -41,7 +41,7 @@ static_library("personalization_app") {
"//components/keyed_service/core",
"//content/public/browser",
"//ui/chromeos/styles:cros_styles_views",
"//ui/resources:webui_generated_resources_grd_grit",
"//ui/resources:webui_resources_grd_grit",
"//ui/webui",
]
}

@ -29,7 +29,7 @@
#include "content/public/common/url_constants.h"
#include "services/network/public/mojom/content_security_policy.mojom-shared.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/resources/grit/webui_generated_resources.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"
@ -52,8 +52,7 @@ void AddResources(content::WebUIDataSource* source) {
source->AddResourcePath("", IDR_ASH_PERSONALIZATION_APP_INDEX_HTML);
source->AddResourcePaths(base::make_span(
kAshPersonalizationAppResources, kAshPersonalizationAppResourcesSize));
source->AddResourcePath("test_loader.html",
IDR_WEBUI_GENERATED_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.html", IDR_WEBUI_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.js", IDR_WEBUI_JS_TEST_LOADER_JS);
source->AddResourcePath("test_loader_util.js",
IDR_WEBUI_JS_TEST_LOADER_UTIL_JS);

@ -14,7 +14,7 @@
#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_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
namespace ash {
namespace printing {
@ -28,8 +28,7 @@ void SetUpWebUIDataSource(content::WebUIDataSource* source,
source->AddResourcePath(resource.path, resource.id);
}
source->SetDefaultResource(default_resource);
source->AddResourcePath("test_loader.html",
IDR_WEBUI_GENERATED_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.html", IDR_WEBUI_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.js", IDR_WEBUI_JS_TEST_LOADER_JS);
source->AddResourcePath("test_loader_util.js",
IDR_WEBUI_JS_TEST_LOADER_UTIL_JS);

@ -25,7 +25,7 @@
#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_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
namespace ash {
@ -39,8 +39,7 @@ void SetUpWebUIDataSource(content::WebUIDataSource* source,
}
source->SetDefaultResource(default_resource);
source->AddResourcePath("test_loader.html",
IDR_WEBUI_GENERATED_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.html", IDR_WEBUI_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.js", IDR_WEBUI_JS_TEST_LOADER_JS);
source->AddResourcePath("test_loader_util.js",
IDR_WEBUI_JS_TEST_LOADER_UTIL_JS);

@ -24,7 +24,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_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
namespace ash {
@ -37,8 +37,7 @@ void SetUpWebUIDataSource(content::WebUIDataSource* source,
int default_resource) {
source->AddResourcePaths(resources);
source->SetDefaultResource(default_resource);
source->AddResourcePath("test_loader.html",
IDR_WEBUI_GENERATED_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.html", IDR_WEBUI_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.js", IDR_WEBUI_JS_TEST_LOADER_JS);
source->AddResourcePath("test_loader_util.js",
IDR_WEBUI_JS_TEST_LOADER_UTIL_JS);

@ -21,7 +21,7 @@ static_library("shortcut_customization_ui") {
"//ash/webui/system_apps/public:system_web_app_config",
"//chromeos/strings",
"//content/public/browser",
"//ui/resources:webui_generated_resources_grd_grit",
"//ui/resources:webui_resources_grd_grit",
"//ui/webui",
]
}

@ -19,7 +19,7 @@
#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_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/mojo_web_ui_controller.h"
namespace ash {
@ -31,8 +31,7 @@ void SetUpWebUIDataSource(content::WebUIDataSource* source,
int default_resource) {
source->AddResourcePaths(resources);
source->SetDefaultResource(default_resource);
source->AddResourcePath("test_loader.html",
IDR_WEBUI_GENERATED_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.html", IDR_WEBUI_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.js", IDR_WEBUI_JS_TEST_LOADER_JS);
source->AddResourcePath("test_loader_util.js",
IDR_WEBUI_JS_TEST_LOADER_UTIL_JS);

@ -24,7 +24,7 @@
#include "content/public/browser/web_ui_data_source.h"
#include "net/base/url_util.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/strings/grit/ui_strings.h"
#include "ui/web_dialogs/web_dialog_delegate.h"

@ -28,7 +28,7 @@
#include "ui/base/text/bytes_formatting.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/chromeos/devicetype_utils.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/strings/grit/ui_strings.h"
#include "ui/web_dialogs/web_dialog_ui.h"
#include "ui/webui/mojo_web_ui_controller.h"

@ -27,7 +27,7 @@
#include "ui/base/text/bytes_formatting.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/chromeos/devicetype_utils.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/strings/grit/ui_strings.h"
#include "ui/web_dialogs/web_dialog_ui.h"
#include "ui/webui/mojo_web_ui_controller.h"

@ -23,7 +23,7 @@
#include "content/public/browser/web_ui_data_source.h"
#include "ui/base/emoji/emoji_panel_helper.h"
#include "ui/base/ime/ash/ime_bridge.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
namespace {
constexpr gfx::Size kDefaultWindowSize(396, 454);

@ -147,7 +147,7 @@
#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_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
namespace ash {

@ -35,7 +35,7 @@
#include "content/public/browser/web_ui_message_handler.h"
#include "services/network/public/mojom/content_security_policy.mojom.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
namespace ash {

@ -14,7 +14,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_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
namespace ash {

@ -14,7 +14,7 @@
#include "chrome/grit/bluetooth_internals_resources_map.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_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "chrome/browser/ash/bluetooth/debug_logs_manager_factory.h"

@ -16,7 +16,7 @@
#include "content/public/browser/web_ui_data_source.h"
#include "content/public/browser/web_ui_message_handler.h"
#include "services/network/public/mojom/content_security_policy.mojom.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
content::WebUIDataSource* CreateInvalidationsHTMLSource() {
// This is done once per opening of the page

@ -41,7 +41,7 @@
#include "services/network/public/mojom/host_resolver.mojom.h"
#include "services/network/public/mojom/network_context.mojom.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
#include "url/scheme_host_port.h"
using content::BrowserThread;

@ -81,7 +81,7 @@
#include "ui/base/webui/web_ui_util.h"
#include "ui/color/color_provider.h"
#include "ui/native_theme/native_theme.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/webui/color_change_listener/color_change_handler.h"
#include "url/url_util.h"

@ -36,7 +36,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/color/color_provider.h"
#include "ui/gfx/color_utils.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
#include "url/url_util.h"
using content::BrowserContext;

@ -62,7 +62,7 @@
#include "ui/base/webui/web_ui_util.h"
#include "ui/base/window_open_disposition_utils.h"
#include "ui/gfx/vector_icon_types.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
namespace {

@ -20,7 +20,7 @@
#include "third_party/skia/include/core/SkColor.h"
#include "ui/base/webui/resource_path.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
#include "url/gurl.h"
namespace {
@ -79,7 +79,7 @@ DiceWebSigninInterceptUI::DiceWebSigninInterceptUI(content::WebUI* web_ui)
// Resources for testing.
{"test_loader.js", IDR_WEBUI_JS_TEST_LOADER_JS},
{"test_loader_util.js", IDR_WEBUI_JS_TEST_LOADER_UTIL_JS},
{"test_loader.html", IDR_WEBUI_GENERATED_TEST_LOADER_HTML},
{"test_loader.html", IDR_WEBUI_TEST_LOADER_HTML},
};
source->AddResourcePaths(kResources);

@ -24,7 +24,7 @@
#include "services/network/public/mojom/content_security_policy.mojom.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/webui/resource_path.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
EnterpriseProfileWelcomeUI::EnterpriseProfileWelcomeUI(content::WebUI* web_ui)
: content::WebUIController(web_ui) {

@ -29,7 +29,7 @@
#include "services/network/public/mojom/content_security_policy.mojom.h"
#include "ui/base/webui/resource_path.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
ProfileCustomizationUI::ProfileCustomizationUI(content::WebUI* web_ui)
: ui::MojoWebUIController(web_ui, /*enable_chrome_send=*/true),

@ -34,7 +34,7 @@
#include "ui/base/webui/resource_path.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/gfx/image/image.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
namespace {

@ -43,7 +43,7 @@
#include "ui/base/webui/web_ui_util.h"
#include "ui/gfx/color_utils.h"
#include "ui/native_theme/native_theme.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
namespace {
const char kSyncBenefitAutofillStringName[] = "syncConfirmationAutofill";

@ -11,7 +11,7 @@
#include "services/network/public/mojom/content_security_policy.mojom.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
@ -49,8 +49,7 @@ void SetJSModuleDefaults(content::WebUIDataSource* source) {
source->AddResourcePath("test_loader.js", IDR_WEBUI_JS_TEST_LOADER_JS);
source->AddResourcePath("test_loader_util.js",
IDR_WEBUI_JS_TEST_LOADER_UTIL_JS);
source->AddResourcePath("test_loader.html",
IDR_WEBUI_GENERATED_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.html", IDR_WEBUI_TEST_LOADER_HTML);
}
void SetupWebUIDataSource(content::WebUIDataSource* source,

@ -107,7 +107,7 @@ template("chrome_extra_paks") {
"$root_gen_dir/skia/skia_resources.pak",
"$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/ui/resources/webui_generated_resources.pak",
"$root_gen_dir/ui/resources/webui_resources.pak",
]
deps = [
"//base/tracing/protos:chrome_track_event_resources",

@ -10,7 +10,7 @@
#include "chrome/test/data/grit/webui_generated_test_resources_map.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_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
namespace webui {
@ -34,8 +34,7 @@ content::WebUIDataSource* CreateWebUITestDataSource() {
source->AddResourcePath("test_loader.js", IDR_WEBUI_JS_TEST_LOADER_JS);
source->AddResourcePath("test_loader_util.js",
IDR_WEBUI_JS_TEST_LOADER_UTIL_JS);
source->AddResourcePath("test_loader.html",
IDR_WEBUI_GENERATED_TEST_LOADER_HTML);
source->AddResourcePath("test_loader.html", IDR_WEBUI_TEST_LOADER_HTML);
return source;
}

@ -585,7 +585,7 @@ 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_generated_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/ax_strings_en-US.pak",
"$root_gen_dir/ui/strings/ui_strings_en-US.pak",

@ -95,8 +95,8 @@ include_rules = [
"+ui/latency",
"+ui/native_theme",
"+ui/resources/grit/ui_resources.h",
"+ui/resources/grit/webui_generated_resources.h",
"+ui/resources/grit/webui_generated_resources_map.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",

@ -17,8 +17,8 @@
#include "skia/grit/skia_resources.h"
#include "skia/grit/skia_resources_map.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_generated_resources_map.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/resources/grit/webui_resources_map.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "chromeos/ash/grit/ash_resources.h"
@ -103,7 +103,7 @@ void PopulateSharedResourcesDataSource(WebUIDataSource* source) {
AddResources(GetContentResourceIds(), kContentResources,
kContentResourcesSize, source);
source->AddResourcePaths(
base::make_span(kWebuiGeneratedResources, kWebuiGeneratedResourcesSize));
base::make_span(kWebuiResources, kWebuiResourcesSize));
source->AddResourcePaths(
base::make_span(kMojoBindingsResources, kMojoBindingsResourcesSize));
source->AddResourcePaths(base::make_span(kSkiaResources, kSkiaResourcesSize));

@ -135,7 +135,7 @@
#include "ui/events/keycodes/dom/keycode_converter.h"
#include "ui/gfx/geometry/point_f.h"
#include "ui/latency/latency_info.h"
#include "ui/resources/grit/webui_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
#if BUILDFLAG(IS_WIN)
#include <combaseapi.h>

@ -445,7 +445,7 @@ repack("pak") {
"$root_gen_dir/third_party/blink/public/strings/blink_accessibility_strings_en-US.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_generated_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/ax_strings_en-US.pak",
"$root_gen_dir/ui/strings/ui_strings_en-US.pak",

@ -424,7 +424,7 @@ executable("web_engine_exe") {
}
source_set("webui_resources") {
data = [ "$root_gen_dir/ui/resources/webui_generated_resources.pak" ]
data = [ "$root_gen_dir/ui/resources/webui_resources.pak" ]
deps = [ "//ui/resources" ]
}

@ -35,7 +35,7 @@ void InitializeResources() {
constexpr char kCommonResourcesPakPath[] = "web_engine_common_resources.pak";
constexpr char kWebUiGeneratedResourcesPakPath[] =
"ui/resources/webui_generated_resources.pak";
"ui/resources/webui_resources.pak";
base::FilePath asset_root;
bool result = base::PathService::Get(base::DIR_ASSETS, &asset_root);
@ -52,11 +52,11 @@ void InitializeResources() {
VLOG(1) << "Loaded resources including locale: " << locale;
// Conditionally load WebUI resource PAK if visible from namespace.
const base::FilePath webui_generated_resources_path =
const base::FilePath webui_resources_path =
asset_root.Append(kWebUiGeneratedResourcesPakPath);
if (base::PathExists(webui_generated_resources_path)) {
if (base::PathExists(webui_resources_path)) {
ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
webui_generated_resources_path, ui::kScaleFactorNone);
webui_resources_path, ui::kScaleFactorNone);
}
}

@ -58,7 +58,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_generated_resources.pak",
"$root_gen_dir/ui/resources/webui_resources.pak",
]
deps = [

@ -68,7 +68,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_generated_resources.pak",
"$root_gen_dir/ui/resources/webui_resources.pak",
]
deps = [
":ios_resources",

@ -17,7 +17,7 @@ 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_generated_resources.pak",
"$root_gen_dir/ui/resources/webui_resources.pak",
]
deps = [
":resources",

@ -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_generated_resources.h"
#import "ui/resources/grit/webui_generated_resources_map.h"
#import "ui/resources/grit/webui_resources.h"
#import "ui/resources/grit/webui_resources_map.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
@ -35,9 +35,10 @@ const char kWebUIResourcesHost[] = "resources";
// Maps a path name (i.e. "/js/path.js") to a resource map entry. Returns
// nullptr if not found.
const webui::ResourcePath* PathToResource(const std::string& path) {
for (size_t i = 0; i < kWebuiGeneratedResourcesSize; ++i) {
if (path == kWebuiGeneratedResources[i].path)
return &kWebuiGeneratedResources[i];
for (size_t i = 0; i < kWebuiResourcesSize; ++i) {
if (path == kWebuiResources[i].path) {
return &kWebuiResources[i];
}
}
for (size_t i = 0; i < kMojoBindingsResourcesSize; ++i) {
if (path == kMojoBindingsResources[i].path)

@ -594,7 +594,7 @@ repack("repack_resources") {
"$root_gen_dir/components/components_resources.pak",
"$root_gen_dir/components/sync_driver_sync_internals_resources.pak",
"$root_gen_dir/ios/web/ios_web_resources.pak",
"$root_gen_dir/ui/resources/webui_generated_resources.pak",
"$root_gen_dir/ui/resources/webui_resources.pak",
]
output = "$target_gen_dir/web_view_resources.pak"
copy_data_to_bundle = true

@ -1033,11 +1033,7 @@
"ui/webui/examples/resources/webui_examples_resources.grd": {
"messages": [4850],
},
"ui/webui/resources/webui_resources.grd": {
"includes": [4860],
"structures": [4880],
},
"<(SHARED_INTERMEDIATE_DIR)/ui/webui/resources/webui_generated_resources.grd": {
"<(SHARED_INTERMEDIATE_DIR)/ui/webui/resources/webui_resources.grd": {
"META": {"sizes": {"includes": [900]}},
"includes": [4900],
},

@ -492,7 +492,7 @@ component("base") {
"//ui/display/util:gpu_info_util",
"//ui/events",
"//ui/events/devices",
"//ui/resources:webui_generated_resources_grd",
"//ui/resources:webui_resources_grd",
"//ui/strings",
"//url",
]

@ -19,7 +19,7 @@ include_rules = [
"+ui/gfx",
"+ui/resources/grit/ui_resources.h",
"+ui/resources/grit/ui_unscaled_resources.h",
"+ui/resources/grit/webui_generated_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",

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

@ -23,7 +23,7 @@
#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_generated_resources.h"
#include "ui/resources/grit/webui_resources.h"
#include "ui/strings/grit/app_locale_settings.h"
#include "url/gurl.h"

@ -11,7 +11,7 @@ group("resources") {
public_deps = [
":ui_resources_grd",
":ui_unscaled_resources_grd",
":webui_generated_resources_grd",
":webui_resources_grd",
]
}
@ -35,16 +35,16 @@ grit("ui_unscaled_resources_grd") {
]
}
grit("webui_generated_resources_grd") {
grit("webui_resources_grd") {
enable_input_discovery_for_gn_analyze = false
source = "$root_gen_dir/ui/webui/resources/webui_generated_resources.grd"
source = "$root_gen_dir/ui/webui/resources/webui_resources.grd"
deps = [ "//ui/webui/resources:build_grd" ]
outputs = [
"grit/webui_generated_resources.h",
"grit/webui_generated_resources_map.cc",
"grit/webui_generated_resources_map.h",
"webui_generated_resources.pak",
"grit/webui_resources.h",
"grit/webui_resources_map.cc",
"grit/webui_resources_map.h",
"webui_resources.pak",
]
}
@ -130,7 +130,7 @@ 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_generated_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/ax_strings_en-US.pak",
"$root_gen_dir/ui/strings/ui_strings_en-US.pak",

@ -84,7 +84,7 @@ 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_generated_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",
"$target_gen_dir/webui_examples_resources.pak",

@ -12,7 +12,7 @@ import("./cr_elements/cr_elements.gni")
import("./js/js.gni")
generate_grd("build_grd") {
grd_prefix = "webui_generated"
grd_prefix = "webui"
out_grd = "$target_gen_dir/${grd_prefix}_resources.grd"
input_files = [ "test_loader.html" ]

@ -154,7 +154,7 @@ repack("support_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",
"$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
"$root_gen_dir/ui/resources/webui_generated_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/ax_strings_en-US.pak",
"$root_gen_dir/ui/strings/ui_strings_en-US.pak",