Skip to content

GitLab

T
tangled
Commit 19c7e454 authored by rbpotter's avatar rbpotter Committed by Commit Bot
Browse files
Options

WebuiJsException Page: Update to preprocess_grit/generate_grd 

Bug: 1132403
Change-Id: Ia84ffd754058cd44ac0f2210837838c8a1fb5a4b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2488394
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: default avatardpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819444}
parent 852685eb
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 110 deletions
chrome/browser/resources/BUILD.gn
View file @ 19c7e454
......@@ -679,21 +679,23 @@ if (enable_webui_tab_strip) {
if (is_linux || is_chromeos) {
grit("webui_js_exception_resources") {
if (optimize_webui) {
source = "webui_js_exception/webui_js_exception_resources_vulcanized.grd"
deps = [ "//chrome/browser/resources/webui_js_exception:build" ]
} else {
source = "webui_js_exception/webui_js_exception_resources.grd"
deps =
[ "//chrome/browser/resources/webui_js_exception:webui_js_exception" ]
}
grit_flags = [
"-E",
"root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
"-E",
"root_src_dir=" + rebase_path("//", root_build_dir),
]
defines = chrome_grit_defines
# These arguments are needed since the grd is generated at build time.
enable_input_discovery_for_gn_analyze = false
defines += [ "SHARED_INTERMEDIATE_DIR=" +
rebase_path(root_gen_dir, root_build_dir) ]
js_gen_dir = "$root_gen_dir/chrome/browser/resources/webui_js_exception"
source = "$js_gen_dir/webui_js_exception_resources.grd"
deps = [ "//chrome/browser/resources/webui_js_exception:build_grd" ]
outputs = [
"grit/webui_js_exception_resources.h",
"grit/webui_js_exception_resources_map.cc",
......
chrome/browser/resources/webui_js_exception/BUILD.gn
View file @ 19c7e454
......@@ -4,51 +4,52 @@
import("//chrome/browser/resources/optimize_webui.gni")
import("//third_party/closure_compiler/compile_js.gni")
import("//tools/grit/grit_rule.gni")
import("//tools/grit/preprocess_grit.gni")
import("//ui/webui/resources/tools/generate_grd.gni")
import("//ui/webui/webui_features.gni")
js_library("webui_js_exception") {
}
preprocess_folder = "preprocessed"
preprocess_manifest = "preprocessed_manifest.json"
if (optimize_webui) {
grit("flattened_resources") {
source = "webui_js_exception_resources.grd"
deps = [ ":webui_js_exception" ]
grit_flags = [
"-E",
"root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
]
outputs = [
"grit/webui_js_exception_resources.h",
"grit/webui_js_exception_resources_map.cc",
"grit/webui_js_exception_resources_map.h",
"webui_js_exception_resources.pak",
]
output_dir = "$root_gen_dir/chrome/browser/resources/webui_js_exception"
}
unpak("unpak") {
pak_file = "webui_js_exception_resources.pak"
out_folder = "unpak"
deps = [ ":flattened_resources" ]
}
build_manifest = "build_manifest.json"
optimize_webui("build") {
host = "webui_js_exception"
input = rebase_path("$target_gen_dir/unpak", root_build_dir)
deps = [
":unpak",
"//ui/webui/resources:modulize",
]
input = rebase_path("$target_gen_dir/$preprocess_folder", root_build_dir)
deps = [ ":preprocess" ]
js_module_in_files = [ "webui_js_exception.js" ]
js_out_files = [ "webui_js_exception.rollup.js" ]
excludes = [ "chrome://resources/js/cr.m.js" ]
out_manifest = "$target_gen_dir/$build_manifest"
}
}
preprocess_grit("preprocess") {
in_folder = "./"
out_folder = "$target_gen_dir/$preprocess_folder"
out_manifest = "$target_gen_dir/$preprocess_manifest"
in_files = [ "webui_js_exception.js" ]
}
generate_grd("build_grd") {
input_files = [ "webui_js_exception.html" ]
input_files_base_dir = rebase_path(".", "//")
if (optimize_webui) {
deps = [ ":build" ]
resource_path_rewrites =
[ "webui_js_exception.rollup.js|webui_js_exception.js" ]
manifest_files = [ "$target_gen_dir/$build_manifest" ]
} else {
deps = [ ":preprocess" ]
manifest_files = [ "$target_gen_dir/$preprocess_manifest" ]
}
grd_prefix = "webui_js_exception"
out_grd = "$target_gen_dir/${grd_prefix}_resources.grd"
}
js_type_check("closure_compile") {
deps = [ ":webui_js_exception" ]
}
js_library("webui_js_exception") {
}
chrome/browser/resources/webui_js_exception/webui_js_exception_resources.grd deleted 100644 → 0
View file @ 852685eb
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<outputs>
<output filename="grit/webui_js_exception_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="grit/webui_js_exception_resources_map.cc"
type="resource_file_map_source" />
<output filename="grit/webui_js_exception_resources_map.h"
type="resource_map_header" />
<output filename="webui_js_exception_resources.pak" type="data_package" />
</outputs>
<release seq="1">
<structures>
<structure name="IDR_WEBUI_JS_EXCEPTION_UI_WEBUI_JS_EXCEPTION_JS"
file="webui_js_exception.js" type="chrome_html" compress="false" />
<structure name="IDR_WEBUI_JS_EXCEPTION_UI_WEBUI_JS_EXCEPTION_HTML"
file="webui_js_exception.html" type="chrome_html" compress="false" />
</structures>
</release>
</grit>
chrome/browser/resources/webui_js_exception/webui_js_exception_resources_vulcanized.grd deleted 100644 → 0
View file @ 852685eb
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<outputs>
<output filename="grit/webui_js_exception_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="grit/webui_js_exception_resources_map.cc"
type="resource_map_source" />
<output filename="grit/webui_js_exception_resources_map.h"
type="resource_map_header" />
<output filename="webui_js_exception_resources.pak" type="data_package" />
</outputs>
<release seq="1">
<includes>
<include name="IDR_WEBUI_JS_EXCEPTION_UI_WEBUI_JS_EXCEPTION_ROLLUP_JS"
file="${root_gen_dir}/chrome/browser/resources/webui_js_exception/webui_js_exception.rollup.js"
use_base_dir="false" type="BINDATA" />
<include name="IDR_WEBUI_JS_EXCEPTION_UI_WEBUI_JS_EXCEPTION_HTML"
file="webui_js_exception.html" preprocess="true" type="BINDATA" />
</includes>
</release>
</grit>
chrome/browser/ui/webui/webui_js_exception/webui_js_exception_ui.cc
View file @ 19c7e454
......@@ -9,7 +9,6 @@
#include "base/feature_list.h"
#include "base/logging.h"
#include "build/build_config.h"
#include "build/buildflag.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/webui/webui_util.h"
#include "chrome/common/buildflags.h"
......@@ -19,13 +18,6 @@
#include "content/public/browser/web_ui_data_source.h"
#include "content/public/common/content_features.h"
#if !BUILDFLAG(OPTIMIZE_WEBUI)
namespace {
constexpr char kGeneratedPath[] =
"@out_folder@/gen/chrome/browser/resources/webui_js_exception/";
} // namespace
#endif // !BUILDFLAG(OPTIMIZE_WEBUI)
WebUIJsExceptionUI::WebUIJsExceptionUI(content::WebUI* web_ui)
: content::WebUIController(web_ui) {
#if !defined(OS_WIN) && !defined(OS_FUCHSIA)
......@@ -41,18 +33,11 @@ WebUIJsExceptionUI::WebUIJsExceptionUI(content::WebUI* web_ui)
content::WebUIDataSource* source =
content::WebUIDataSource::Create(chrome::kChromeUIWebUIJsExceptionHost);
#if BUILDFLAG(OPTIMIZE_WEBUI)
webui::SetupBundledWebUIDataSource(
source, "webui_js_exception.js",
IDR_WEBUI_JS_EXCEPTION_UI_WEBUI_JS_EXCEPTION_ROLLUP_JS,
IDR_WEBUI_JS_EXCEPTION_UI_WEBUI_JS_EXCEPTION_HTML);
#else // if !BUILDFLAG(OPTIMIZE_WEBUI)
webui::SetupWebUIDataSource(
source,
base::make_span(kWebuiJsExceptionResources,
kWebuiJsExceptionResourcesSize),
kGeneratedPath, IDR_WEBUI_JS_EXCEPTION_UI_WEBUI_JS_EXCEPTION_HTML);
#endif // !BUILDFLAG(OPTIMIZE_WEBUI)
webui::SetupWebUIDataSource(source,
base::make_span(kWebuiJsExceptionResources,
kWebuiJsExceptionResourcesSize),
std::string(),
IDR_WEBUI_JS_EXCEPTION_WEBUI_JS_EXCEPTION_HTML);
Profile* profile = Profile::FromWebUI(web_ui);
content::WebUIDataSource::Add(profile, source);
}
......
tools/gritsettings/resource_ids.spec
View file @ 19c7e454
......@@ -259,12 +259,9 @@
"chrome/browser/resources/webapks/webapks_ui_resources.grd": {
"includes": [2220],
},
"chrome/browser/resources/webui_js_exception/webui_js_exception_resources.grd": {
"<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/webui_js_exception/webui_js_exception_resources.grd": {
"META": {"sizes": {"includes": [10],}},
"includes": [2230],
"structures": [2231],
},
"chrome/browser/resources/webui_js_exception/webui_js_exception_resources_vulcanized.grd": {
"includes": [2232],
},
"components/sync/driver/resources.grd": {
"includes": [2240],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment