Skip to content

GitLab

T
tangled
Commit c8f6887b authored by dpapad's avatar dpapad Committed by Commit Bot
Browse files
Options

Welcome WebUI: Auto-generate grd file. 

Bug: 1132403
Change-Id: I7fb7561cf7a808fe26420dae42814e5f41072b71
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2470305
Commit-Queue: John Lee <johntlee@chromium.org>
Auto-Submit: dpapad <dpapad@chromium.org>
Reviewed-by: default avatarJohn Lee <johntlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817670}
parent 911a834f
Show whitespace changes
Inline Side-by-side
Showing with 89 additions and 152 deletions
chrome/browser/resources/BUILD.gn
View file @ c8f6887b
......@@ -499,15 +499,23 @@ if (is_chromeos) {
if (!is_android && !is_chromeos) {
grit("welcome_resources") {
source = "welcome/welcome_resources.grd"
deps = [ "//chrome/browser/resources/welcome:web_components" ]
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) ]
welcome_gen_dir = "$root_gen_dir/chrome/browser/resources/welcome"
source = "$welcome_gen_dir/welcome_resources.grd"
deps = [ "//chrome/browser/resources/welcome:build_grd" ]
outputs = [
"grit/welcome_resources.h",
"grit/welcome_resources_map.cc",
......
chrome/browser/resources/welcome/BUILD.gn
View file @ c8f6887b
......@@ -3,7 +3,82 @@
# found in the LICENSE file.
import("//third_party/closure_compiler/compile_js.gni")
import("//tools/grit/preprocess_grit.gni")
import("//tools/polymer/html_to_js.gni")
import("//ui/webui/resources/tools/generate_grd.gni")
preprocess_folder = "preprocessed"
preprocess_manifest = "preprocessed_manifest.json"
preprocess_gen_manifest = "preprocessed_gen_manifest.json"
generate_grd("build_grd") {
grd_prefix = "welcome"
out_grd = "$target_gen_dir/${grd_prefix}_resources.grd"
input_files = [
"images/background_svgs/blue_circle.svg",
"images/background_svgs/green_rectangle.svg",
"images/background_svgs/grey_oval.svg",
"images/background_svgs/grey_rounded_rectangle.svg",
"images/background_svgs/red_triangle.svg",
"images/background_svgs/yellow_dots.svg",
"images/background_svgs/yellow_semicircle.svg",
"welcome.html",
"welcome.css",
]
input_files_base_dir = rebase_path(".", "//")
deps = [
":preprocess",
":preprocess_generated",
]
manifest_files = [
"$target_gen_dir/$preprocess_manifest",
"$target_gen_dir/$preprocess_gen_manifest",
]
}
preprocess_grit("preprocess") {
in_folder = "./"
out_folder = "$target_gen_dir/$preprocess_folder"
out_manifest = "$target_gen_dir/$preprocess_manifest"
in_files = [
"google_apps/google_app_proxy.js",
"google_apps/google_apps_metrics_proxy.js",
"landing_view_proxy.js",
"navigation_behavior.js",
"ntp_background/ntp_background_metrics_proxy.js",
"ntp_background/ntp_background_proxy.js",
"set_as_default/nux_set_as_default_proxy.js",
"shared/bookmark_proxy.js",
"shared/module_metrics_proxy.js",
"shared/nux_types.js",
"signin_view_proxy.js",
"welcome_browser_proxy.js",
"welcome.js",
]
}
preprocess_grit("preprocess_generated") {
deps = [ ":web_components" ]
in_folder = target_gen_dir
out_folder = "$target_gen_dir/$preprocess_folder"
out_manifest = "$target_gen_dir/$preprocess_gen_manifest"
in_files = [
"google_apps/nux_google_apps.js",
"landing_view.js",
"ntp_background/nux_ntp_background.js",
"set_as_default/nux_set_as_default.js",
"shared/action_link_style_css.js",
"shared/animations_css.js",
"shared/chooser_shared_css.js",
"shared/navi_colors_css.js",
"shared/onboarding_background.js",
"shared/splash_pages_shared_css.js",
"shared/step_indicator.js",
"signin_view.js",
"welcome_app.js",
]
}
group("closure_compile") {
deps = [
......
chrome/browser/resources/welcome/welcome_resources.grd deleted 100644 → 0
View file @ 911a834f
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<outputs>
<output filename="grit/welcome_resources.h"
type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="grit/welcome_resources_map.cc"
type="resource_file_map_source" />
<output filename="grit/welcome_resources_map.h"
type="resource_map_header" />
<output filename="welcome_resources.pak"
type="data_package" />
</outputs>
<release seq="1">
<includes>
<include name="IDR_WELCOME_IMAGES_BACKGROUND_SVGS_BLUE_CIRCLE_SVG"
file="images/background_svgs/blue_circle.svg"
type="BINDATA" />
<include name="IDR_WELCOME_IMAGES_BACKGROUND_SVGS_GREEN_RECTANGLE_SVG"
file="images/background_svgs/green_rectangle.svg"
type="BINDATA" />
<include name="IDR_WELCOME_IMAGES_BACKGROUND_SVGS_GREY_OVAL_SVG"
file="images/background_svgs/grey_oval.svg"
type="BINDATA" />
<include name="IDR_WELCOME_IMAGES_BACKGROUND_SVGS_GREY_ROUNDED_RECTANGLE_SVG"
file="images/background_svgs/grey_rounded_rectangle.svg"
type="BINDATA" />
<include name="IDR_WELCOME_IMAGES_BACKGROUND_SVGS_RED_TRIANGLE_SVG"
file="images/background_svgs/red_triangle.svg"
type="BINDATA" />
<include name="IDR_WELCOME_IMAGES_BACKGROUND_SVGS_YELLOW_DOTS_SVG"
file="images/background_svgs/yellow_dots.svg"
type="BINDATA" />
<include name="IDR_WELCOME_IMAGES_BACKGROUND_SVGS_YELLOW_SEMICIRCLE_SVG"
file="images/background_svgs/yellow_semicircle.svg"
type="BINDATA" />
<!-- Generated Polymer 3 elements -->
<include name="IDR_WELCOME_APP_JS"
file="${root_gen_dir}/chrome/browser/resources/welcome/welcome_app.js"
use_base_dir="false" type="BINDATA" preprocess="true"/>
<include name="IDR_GOOGLE_APPS_JS"
file="${root_gen_dir}/chrome/browser/resources/welcome/google_apps/nux_google_apps.js"
use_base_dir="false" type="BINDATA" preprocess="true"/>
<include name="IDR_SET_AS_DEFAULT_JS"
file="${root_gen_dir}/chrome/browser/resources/welcome/set_as_default/nux_set_as_default.js"
use_base_dir="false" type="BINDATA" preprocess="true"/>
<include name="IDR_WELCOME_LANDING_VIEW_JS"
file="${root_gen_dir}/chrome/browser/resources/welcome/landing_view.js"
use_base_dir="false" type="BINDATA"/>
<include name="IDR_WELCOME_SIGNIN_VIEW_JS"
file="${root_gen_dir}/chrome/browser/resources/welcome/signin_view.js"
use_base_dir="false" type="BINDATA"/>
<include name="IDR_NTP_BACKGROUND_JS"
file="${root_gen_dir}/chrome/browser/resources/welcome/ntp_background/nux_ntp_background.js"
use_base_dir="false" type="BINDATA"/>
<include name="IDR_WELCOME_SHARED_STEP_INDICATOR_JS"
file="${root_gen_dir}/chrome/browser/resources/welcome/shared/step_indicator.js"
use_base_dir="false" type="BINDATA"/>
<include name="IDR_WELCOME_SHARED_ONBOARDING_BACKGROUND_JS"
file="${root_gen_dir}/chrome/browser/resources/welcome/shared/onboarding_background.js"
use_base_dir="false" type="BINDATA"/>
<!-- Generated style files -->
<include name="IDR_WELCOME_SHARED_ANIMATIONS_CSS_JS"
file="${root_gen_dir}/chrome/browser/resources/welcome/shared/animations_css.js"
use_base_dir="false" type="BINDATA"/>
<include name="IDR_WELCOME_SHARED_CHOOSER_SHARED_CSS_JS"
file="${root_gen_dir}/chrome/browser/resources/welcome/shared/chooser_shared_css.js"
use_base_dir="false" type="BINDATA"/>
<include name="IDR_WELCOME_SHARED_NAVI_COLORS_CSS_JS"
file="${root_gen_dir}/chrome/browser/resources/welcome/shared/navi_colors_css.js"
use_base_dir="false" type="BINDATA"/>
<include name="IDR_WELCOME_SHARED_ACTION_LINK_STYLE_CSS_JS"
file="${root_gen_dir}/chrome/browser/resources/welcome/shared/action_link_style_css.js"
use_base_dir="false" type="BINDATA"/>
<include name="IDR_WELCOME_SHARED_SPLASH_PAGES_SHARED_CSS_JS"
file="${root_gen_dir}/chrome/browser/resources/welcome/shared/splash_pages_shared_css.js"
use_base_dir="false" type="BINDATA"/>
</includes>
<structures>
<structure name="IDR_WELCOME_LANDING_VIEW_PROXY_JS"
file="landing_view_proxy.js"
type="chrome_html"
preprocess="true"/>
<structure name="IDR_WELCOME_NAVIGATION_BEHAVIOR_JS"
file="navigation_behavior.js"
type="chrome_html"
preprocess="true"/>
<structure name="IDR_WELCOME_SHARED_BOOKMARK_PROXY_JS"
file="shared/bookmark_proxy.js"
type="chrome_html" />
<structure name="IDR_WELCOME_SHARED_MODULE_METRICS_PROXY_JS"
file="shared/module_metrics_proxy.js"
type="chrome_html" />
<structure name="IDR_WELCOME_SHARED_NUX_TYPES_JS"
file="shared/nux_types.js"
type="chrome_html" />
<structure name="IDR_WELCOME_SIGNIN_VIEW_PROXY_JS"
file="signin_view_proxy.js"
type="chrome_html"
preprocess="true"/>
<structure name="IDR_WELCOME_BROWSER_PROXY_JS"
file="welcome_browser_proxy.js"
type="chrome_html"/>
<structure name="IDR_WELCOME_CSS"
file="welcome.css"
type="chrome_html"
preprocess="true"/>
<structure name="IDR_WELCOME_HTML"
file="welcome.html"
type="chrome_html"
preprocess="true"/>
<structure name="IDR_WELCOME_JS"
file="welcome.js"
type="chrome_html"
preprocess="true"/>
<!-- Google apps-->
<structure name="IDR_GOOGLE_APP_PROXY_JS"
file="google_apps/google_app_proxy.js"
type="chrome_html" />
<structure name="IDR_GOOGLE_APPS_METRICS_PROXY_JS"
file="google_apps/google_apps_metrics_proxy.js"
type="chrome_html" />
<!-- Set as default-->
<structure name="IDR_SET_AS_DEFAULT_PROXY_JS"
file="set_as_default/nux_set_as_default_proxy.js"
type="chrome_html" />
<!-- NTP background-->
<structure name="IDR_NTP_BACKGROUND_PROXY_JS"
file="ntp_background/ntp_background_proxy.js"
type="chrome_html" />
<structure name="IDR_NTP_BACKGROUND_METRICS_PROXY_JS"
file="ntp_background/ntp_background_metrics_proxy.js"
type="chrome_html" />
</structures>
</release>
</grit>
chrome/browser/ui/webui/welcome/welcome_ui.cc
View file @ c8f6887b
......@@ -34,9 +34,6 @@
namespace {
constexpr char kGeneratedPath[] =
"@out_folder@/gen/chrome/browser/resources/welcome/";
const char kPreviewBackgroundPath[] = "preview-background.jpg";
bool ShouldHandleRequestCallback(base::WeakPtr<WelcomeUI> weak_ptr,
......@@ -133,7 +130,7 @@ WelcomeUI::WelcomeUI(content::WebUI* web_ui, const GURL& url)
content::WebUIDataSource::Create(url.host());
webui::SetupWebUIDataSource(
html_source, base::make_span(kWelcomeResources, kWelcomeResourcesSize),
kGeneratedPath, IDR_WELCOME_HTML);
"", IDR_WELCOME_WELCOME_HTML);
// Add welcome strings.
AddStrings(html_source);
......
tools/gritsettings/resource_ids.spec
View file @ c8f6887b
......@@ -194,9 +194,9 @@
"structures": [1900],
"includes": [1920],
},
"chrome/browser/resources/welcome/welcome_resources.grd": {
"<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/welcome/welcome_resources.grd": {
"META": {"sizes": {"includes": [30]}},
"includes": [1940],
"structures": [1960],
},
"chrome/browser/supervised_user/supervised_user_unscaled_resources.grd": {
"includes": [1970],
......
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