Skip to content

GitLab

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

Onboarding WebUI: Add dedicated grd file to hold all files. 

This is in preparation of gzipping files for this WebUI.
Bug: 895633

Change-Id: I43cbb74a11a5ab6317cf2a4cf42d77592a06ae46
Reviewed-on: https://chromium-review.googlesource.com/c/1285210Reviewed-by: default avatarScott Chen <scottchen@chromium.org>
Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600919}
parent 9f54e0e2
Hide whitespace changes
Inline Side-by-side
Showing with 171 additions and 148 deletions
chrome/BUILD.gn
View file @ b1f8e9a1
......@@ -1579,6 +1579,10 @@ group("extra_resources") {
]
}
if (!is_android && !is_chromeos) {
public_deps += [ "//chrome/browser/resources:onboarding_welcome_resources" ]
}
if (enable_extensions) {
public_deps += [
"//chrome/browser/resources:extensions_resources",
......
chrome/browser/browser_resources.grd
View file @ b1f8e9a1
......@@ -61,41 +61,6 @@
<structure name="IDR_DICE_WELCOME_BROWSER_PROXY_JS" file="resources\welcome\dice_welcome\welcome_browser_proxy.js" type="chrome_html" preprocess="true"/>
<structure name="IDR_DICE_WELCOME_APP_HTML" file="resources\welcome\dice_welcome\welcome_app.html" type="chrome_html" preprocess="true"/>
<structure name="IDR_DICE_WELCOME_APP_JS" file="resources\welcome\dice_welcome\welcome_app.js" type="chrome_html" preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_LANDING_VIEW_HTML" file="resources\welcome\onboarding_welcome\landing_view.html" type="chrome_html" preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_LANDING_VIEW_JS" file="resources\welcome\onboarding_welcome\landing_view.js" type="chrome_html" preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_NAVIGATION_BEHAVIOR_HTML" file="resources\welcome\onboarding_welcome\navigation_behavior.html" type="chrome_html" preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_NAVIGATION_BEHAVIOR_JS" file="resources\welcome\onboarding_welcome\navigation_behavior.js" type="chrome_html" preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_SIGNIN_VIEW_HTML" file="resources\welcome\onboarding_welcome\signin_view.html" type="chrome_html" preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_SIGNIN_VIEW_JS" file="resources\welcome\onboarding_welcome\signin_view.js" type="chrome_html" preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_APP_HTML" file="resources\welcome\onboarding_welcome\welcome_app.html" type="chrome_html" preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_APP_JS" file="resources\welcome\onboarding_welcome\welcome_app.js" type="chrome_html" preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_BROWSER_PROXY_HTML" file="resources\welcome\onboarding_welcome\welcome_browser_proxy.html" type="chrome_html"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_BROWSER_PROXY_JS" file="resources\welcome\onboarding_welcome\welcome_browser_proxy.js" type="chrome_html"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_CSS" file="resources\welcome\onboarding_welcome\welcome.css" type="chrome_html" preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_HTML" file="resources\welcome\onboarding_welcome\welcome.html" type="chrome_html" preprocess="true"/>
<!-- NUX files -->
<structure name="IDR_NUX_EMAIL_CHOOSER_HTML" file="resources\welcome\onboarding_welcome\email\email_chooser.html" type="chrome_html" />
<structure name="IDR_NUX_EMAIL_CHOOSER_JS" file="resources\welcome\onboarding_welcome\email\email_chooser.js" type="chrome_html" />
<structure name="IDR_NUX_EMAIL_HTML" file="resources\welcome\onboarding_welcome\email\nux_email.html" type="chrome_html" />
<structure name="IDR_NUX_EMAIL_JS" file="resources\welcome\onboarding_welcome\email\nux_email.js" type="chrome_html" />
<structure name="IDR_NUX_EMAIL_PROXY_HTML" file="resources\welcome\onboarding_welcome\email\nux_email_proxy.html" type="chrome_html" />
<structure name="IDR_NUX_EMAIL_PROXY_JS" file="resources\welcome\onboarding_welcome\email\nux_email_proxy.js" type="chrome_html" />
<structure name="IDR_NUX_GOOGLE_APPS_HTML" file="resources\welcome\onboarding_welcome\google_apps\nux_google_apps.html" type="chrome_html" />
<structure name="IDR_NUX_GOOGLE_APPS_JS" file="resources\welcome\onboarding_welcome\google_apps\nux_google_apps.js" type="chrome_html" />
<structure name="IDR_NUX_GOOGLE_APPS_PROXY_HTML" file="resources\welcome\onboarding_welcome\google_apps\nux_google_apps_proxy.html" type="chrome_html" />
<structure name="IDR_NUX_GOOGLE_APPS_PROXY_JS" file="resources\welcome\onboarding_welcome\google_apps\nux_google_apps_proxy.js" type="chrome_html" />
<structure name="IDR_NUX_GOOGLE_APPS_CHOOSER_HTML" file="resources\welcome\onboarding_welcome\google_apps\apps_chooser.html" type="chrome_html" />
<structure name="IDR_NUX_GOOGLE_APPS_CHOOSER_JS" file="resources\welcome\onboarding_welcome\google_apps\apps_chooser.js" type="chrome_html" />
<structure name="IDR_NUX_SET_AS_DEFAULT_HTML" file="resources\welcome\onboarding_welcome\set_as_default\nux_set_as_default.html" type="chrome_html" />
<structure name="IDR_NUX_SET_AS_DEFAULT_JS" file="resources\welcome\onboarding_welcome\set_as_default\nux_set_as_default.js" type="chrome_html" />
<structure name="IDR_NUX_SET_AS_DEFAULT_PROXY_HTML" file="resources\welcome\onboarding_welcome\set_as_default\nux_set_as_default_proxy.html" type="chrome_html" />
<structure name="IDR_NUX_SET_AS_DEFAULT_PROXY_JS" file="resources\welcome\onboarding_welcome\set_as_default\nux_set_as_default_proxy.js" type="chrome_html" />
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_ACTION_LINK_STYLE_JS" file="resources\welcome\onboarding_welcome\shared\action_link_style.js" type="chrome_html" />
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_ACTION_LINK_STYLE_CSS_HTML" file="resources\welcome\onboarding_welcome\shared\action_link_style_css.html" type="chrome_html" />
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_ONBOARDING_BACKGROUND_HTML" file="resources\welcome\onboarding_welcome\shared\onboarding_background.html" type="chrome_html" />
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_ONBOARDING_BACKGROUND_JS" file="resources\welcome\onboarding_welcome\shared\onboarding_background.js" type="chrome_html" />
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_CHOOSER_SHARED_CSS" file="resources\welcome\onboarding_welcome\shared\chooser_shared_css.html" type="chrome_html" />
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_I18N_SETUP_HTML" file="resources\welcome\onboarding_welcome\shared\i18n_setup.html" type="chrome_html" />
</if>
<if expr="is_win">
<structure name="IDR_WELCOME_WIN10_CSS" file="resources\welcome\welcome_win10.css" type="chrome_html" />
......
chrome/browser/resources/BUILD.gn
View file @ b1f8e9a1
......@@ -157,6 +157,21 @@ if (!is_android) {
}
}
if (!is_android && !is_chromeos) {
grit("onboarding_welcome_resources") {
source = "welcome/onboarding_welcome/onboarding_welcome_resources.grd"
defines = chrome_grit_defines
outputs = [
"grit/onboarding_welcome_resources.h",
"grit/onboarding_welcome_resources_map.cc",
"grit/onboarding_welcome_resources_map.h",
"onboarding_welcome_resources.pak",
]
output_dir = "$root_gen_dir/chrome"
}
}
if (enable_extensions) {
grit("extensions_resources") {
if (optimize_webui) {
......
chrome/browser/resources/welcome/onboarding_welcome/onboarding_welcome_resources.grd 0 → 100644
View file @ b1f8e9a1
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<outputs>
<output filename="grit/onboarding_welcome_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="grit/onboarding_welcome_resources_map.cc"
type="resource_file_map_source" />
<output filename="grit/onboarding_welcome_resources_map.h"
type="resource_map_header" />
<output filename="onboarding_welcome_resources.pak" type="data_package" />
</outputs>
<release seq="1">
<structures>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_LANDING_VIEW_JS"
file="landing_view.js"
type="chrome_html"
preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_NAVIGATION_BEHAVIOR_HTML"
file="navigation_behavior.html"
type="chrome_html"
preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_NAVIGATION_BEHAVIOR_JS"
file="navigation_behavior.js"
type="chrome_html"
preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_APP_HTML"
file="welcome_app.html"
type="chrome_html"
preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_APP_JS"
file="welcome_app.js"
type="chrome_html"
preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_BROWSER_PROXY_HTML"
file="welcome_browser_proxy.html"
type="chrome_html"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_BROWSER_PROXY_JS"
file="welcome_browser_proxy.js"
type="chrome_html"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_CSS"
file="welcome.css"
type="chrome_html"
preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_HTML"
file="welcome.html"
type="chrome_html"
preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_LANDING_VIEW_HTML"
file="landing_view.html"
type="chrome_html"
preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_CHOOSER_SHARED_CSS"
file="shared\chooser_shared_css.html"
type="chrome_html" />
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_I18N_SETUP_HTML"
file="shared\i18n_setup.html"
type="chrome_html" />
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_SIGNIN_VIEW_HTML"
file="signin_view.html"
type="chrome_html"
preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_SIGNIN_VIEW_JS"
file="signin_view.js"
type="chrome_html"
preprocess="true"/>
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_ACTION_LINK_STYLE_JS"
file="shared\action_link_style.js"
type="chrome_html" />
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_ACTION_LINK_STYLE_CSS_HTML"
file="shared\action_link_style_css.html"
type="chrome_html" />
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_ONBOARDING_BACKGROUND_HTML"
file="shared\onboarding_background.html"
type="chrome_html" />
<structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_ONBOARDING_BACKGROUND_JS"
file="shared\onboarding_background.js"
type="chrome_html" />
<!-- NUX Email-->
<structure name="IDR_NUX_EMAIL_CHOOSER_HTML"
file="email\email_chooser.html"
type="chrome_html" />
<structure name="IDR_NUX_EMAIL_CHOOSER_JS"
file="email\email_chooser.js"
type="chrome_html" />
<structure name="IDR_NUX_EMAIL_HTML"
file="email\nux_email.html"
type="chrome_html" />
<structure name="IDR_NUX_EMAIL_JS"
file="email\nux_email.js"
type="chrome_html" />
<structure name="IDR_NUX_EMAIL_PROXY_HTML"
file="email\nux_email_proxy.html"
type="chrome_html" />
<structure name="IDR_NUX_EMAIL_PROXY_JS"
file="email\nux_email_proxy.js"
type="chrome_html" />
<!-- NUX Google apps-->
<structure name="IDR_NUX_GOOGLE_APPS_HTML"
file="google_apps\nux_google_apps.html"
type="chrome_html" />
<structure name="IDR_NUX_GOOGLE_APPS_JS"
file="google_apps\nux_google_apps.js"
type="chrome_html" />
<structure name="IDR_NUX_GOOGLE_APPS_PROXY_HTML"
file="google_apps\nux_google_apps_proxy.html"
type="chrome_html" />
<structure name="IDR_NUX_GOOGLE_APPS_PROXY_JS"
file="google_apps\nux_google_apps_proxy.js"
type="chrome_html" />
<structure name="IDR_NUX_GOOGLE_APPS_CHOOSER_HTML"
file="google_apps\apps_chooser.html"
type="chrome_html" />
<structure name="IDR_NUX_GOOGLE_APPS_CHOOSER_JS"
file="google_apps\apps_chooser.js"
type="chrome_html" />
<structure name="IDR_NUX_SET_AS_DEFAULT_HTML"
file="set_as_default\nux_set_as_default.html"
type="chrome_html" />
<structure name="IDR_NUX_SET_AS_DEFAULT_JS"
file="set_as_default\nux_set_as_default.js"
type="chrome_html" />
<structure name="IDR_NUX_SET_AS_DEFAULT_PROXY_HTML"
file="set_as_default\nux_set_as_default_proxy.html"
type="chrome_html" />
<structure name="IDR_NUX_SET_AS_DEFAULT_PROXY_JS"
file="set_as_default\nux_set_as_default_proxy.js"
type="chrome_html" />
</structures>
</release>
</grit>
chrome/browser/ui/webui/welcome/nux/email_handler.cc
View file @ b1f8e9a1
......@@ -132,20 +132,6 @@ void EmailHandler::AddSources(content::WebUIDataSource* html_source,
html_source->AddLocalizedString("bookmarkReplaced",
IDS_NUX_EMAIL_BOOKMARK_REPLACED);
// Add required resources.
html_source->AddResourcePath("email/nux_email.html", IDR_NUX_EMAIL_HTML);
html_source->AddResourcePath("email/nux_email.js", IDR_NUX_EMAIL_JS);
html_source->AddResourcePath("email/nux_email_proxy.html",
IDR_NUX_EMAIL_PROXY_HTML);
html_source->AddResourcePath("email/nux_email_proxy.js",
IDR_NUX_EMAIL_PROXY_JS);
html_source->AddResourcePath("email/email_chooser.html",
IDR_NUX_EMAIL_CHOOSER_HTML);
html_source->AddResourcePath("email/email_chooser.js",
IDR_NUX_EMAIL_CHOOSER_JS);
// Add icons
html_source->AddResourcePath("email/aol_1x.png", IDR_NUX_EMAIL_AOL_1X);
html_source->AddResourcePath("email/aol_2x.png", IDR_NUX_EMAIL_AOL_2X);
......
chrome/browser/ui/webui/welcome/nux/google_apps_handler.cc
View file @ b1f8e9a1
......@@ -135,22 +135,6 @@ void GoogleAppsHandler::AddSources(content::WebUIDataSource* html_source,
html_source->AddLocalizedString("googleAppsDescription",
IDS_NUX_GOOGLE_APPS_DESCRIPTION);
// Add required resources.
html_source->AddResourcePath("apps/nux_google_apps.html",
IDR_NUX_GOOGLE_APPS_HTML);
html_source->AddResourcePath("apps/nux_google_apps.js",
IDR_NUX_GOOGLE_APPS_JS);
html_source->AddResourcePath("apps/nux_google_apps_proxy.html",
IDR_NUX_GOOGLE_APPS_PROXY_HTML);
html_source->AddResourcePath("apps/nux_google_apps_proxy.js",
IDR_NUX_GOOGLE_APPS_PROXY_JS);
html_source->AddResourcePath("apps/apps_chooser.html",
IDR_NUX_GOOGLE_APPS_CHOOSER_HTML);
html_source->AddResourcePath("apps/apps_chooser.js",
IDR_NUX_GOOGLE_APPS_CHOOSER_JS);
// Add icons
html_source->AddResourcePath("apps/chrome_store_1x.png",
IDR_NUX_GOOGLE_APPS_CHROME_STORE_1X);
......
chrome/browser/ui/webui/welcome/nux/set_as_default_handler.cc
View file @ b1f8e9a1
......@@ -4,14 +4,6 @@
#include "chrome/browser/ui/webui/welcome/nux/set_as_default_handler.h"
#include "base/metrics/field_trial_params.h"
#include "base/metrics/histogram_macros.h"
#include "chrome/grit/browser_resources.h"
#include "chrome/grit/generated_resources.h"
#include "components/grit/components_resources.h"
#include "components/strings/grit/components_strings.h"
#include "content/public/browser/web_ui_data_source.h"
namespace nux {
SetAsDefaultHandler::SetAsDefaultHandler()
......@@ -23,20 +15,4 @@ void SetAsDefaultHandler::RecordSetAsDefaultUMA() {
// TODO(scottchen): Add UMA tracking.
}
void SetAsDefaultHandler::AddSources(content::WebUIDataSource* html_source) {
// Localized strings.
// Add required resources.
html_source->AddResourcePath("set_as_default/nux_set_as_default.html",
IDR_NUX_SET_AS_DEFAULT_HTML);
html_source->AddResourcePath("set_as_default/nux_set_as_default.js",
IDR_NUX_SET_AS_DEFAULT_JS);
html_source->AddResourcePath("set_as_default/nux_set_as_default_proxy.html",
IDR_NUX_SET_AS_DEFAULT_PROXY_HTML);
html_source->AddResourcePath("set_as_default/nux_set_as_default_proxy.js",
IDR_NUX_SET_AS_DEFAULT_PROXY_JS);
// Add icons
}
} // namespace nux
\ No newline at end of file
} // namespace nux
chrome/browser/ui/webui/welcome/nux/set_as_default_handler.h
View file @ b1f8e9a1
......@@ -8,10 +8,6 @@
#include "base/macros.h"
#include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h"
namespace content {
class WebUIDataSource;
} // namespace content
namespace nux {
class SetAsDefaultHandler : public settings::DefaultBrowserHandler {
......@@ -19,9 +15,6 @@ class SetAsDefaultHandler : public settings::DefaultBrowserHandler {
SetAsDefaultHandler();
~SetAsDefaultHandler() override;
// Adds webui sources.
static void AddSources(content::WebUIDataSource* html_source);
protected:
void RecordSetAsDefaultUMA() override;
......
chrome/browser/ui/webui/welcome/welcome_ui.cc
View file @ b1f8e9a1
......@@ -22,6 +22,8 @@
#include "chrome/grit/chrome_unscaled_resources.h"
#include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h"
#include "chrome/grit/onboarding_welcome_resources.h"
#include "chrome/grit/onboarding_welcome_resources_map.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui_data_source.h"
......@@ -68,55 +70,14 @@ WelcomeUI::WelcomeUI(content::WebUI* web_ui, const GURL& url)
html_source->AddLocalizedString("headerText", IDS_WELCOME_HEADER);
html_source->AddLocalizedString("acceptText", IDS_WELCOME_ACCEPT_BUTTON);
// Add onboarding welcome resources.
// Add all Onboarding resources.
for (size_t i = 0; i < kOnboardingWelcomeResourcesSize; ++i) {
html_source->AddResourcePath(kOnboardingWelcomeResources[i].name,
kOnboardingWelcomeResources[i].value);
}
html_source->SetDefaultResource(
IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_HTML);
html_source->AddResourcePath(
"landing_view.html", IDR_WELCOME_ONBOARDING_WELCOME_LANDING_VIEW_HTML);
html_source->AddResourcePath(
"landing_view.js", IDR_WELCOME_ONBOARDING_WELCOME_LANDING_VIEW_JS);
html_source->AddResourcePath(
"navigation_behavior.html",
IDR_WELCOME_ONBOARDING_WELCOME_NAVIGATION_BEHAVIOR_HTML);
html_source->AddResourcePath(
"navigation_behavior.js",
IDR_WELCOME_ONBOARDING_WELCOME_NAVIGATION_BEHAVIOR_JS);
html_source->AddResourcePath(
"signin_view.html", IDR_WELCOME_ONBOARDING_WELCOME_SIGNIN_VIEW_HTML);
html_source->AddResourcePath("signin_view.js",
IDR_WELCOME_ONBOARDING_WELCOME_SIGNIN_VIEW_JS);
html_source->AddResourcePath("welcome.css",
IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_CSS);
html_source->AddResourcePath(
"welcome_app.html", IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_APP_HTML);
html_source->AddResourcePath("welcome_app.js",
IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_APP_JS);
html_source->AddResourcePath(
"welcome_browser_proxy.html",
IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_BROWSER_PROXY_HTML);
html_source->AddResourcePath(
"welcome_browser_proxy.js",
IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_BROWSER_PROXY_JS);
// Add resources shared by the NUX modules.
html_source->AddResourcePath(
"shared/action_link_style_css.html",
IDR_WELCOME_ONBOARDING_WELCOME_SHARED_ACTION_LINK_STYLE_CSS_HTML);
html_source->AddResourcePath(
"shared/action_link_style.js",
IDR_WELCOME_ONBOARDING_WELCOME_SHARED_ACTION_LINK_STYLE_JS);
html_source->AddResourcePath(
"shared/chooser_shared_css.html",
IDR_WELCOME_ONBOARDING_WELCOME_SHARED_CHOOSER_SHARED_CSS);
html_source->AddResourcePath(
"shared/onboarding_background.html",
IDR_WELCOME_ONBOARDING_WELCOME_SHARED_ONBOARDING_BACKGROUND_HTML);
html_source->AddResourcePath(
"shared/onboarding_background.js",
IDR_WELCOME_ONBOARDING_WELCOME_SHARED_ONBOARDING_BACKGROUND_JS);
html_source->AddResourcePath(
"shared/i18n_setup.html",
IDR_WELCOME_ONBOARDING_WELCOME_SHARED_I18N_SETUP_HTML);
html_source->AddResourcePath(
"images/background_svgs/blue_circle.svg",
IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_BLUE_CIRCLE_SVG);
......@@ -153,7 +114,6 @@ WelcomeUI::WelcomeUI(content::WebUI* web_ui, const GURL& url)
// Add set-as-default onboarding module.
web_ui->AddMessageHandler(std::make_unique<nux::SetAsDefaultHandler>());
nux::SetAsDefaultHandler::AddSources(html_source);
} else if (kIsBranded && is_dice) {
// Use special layout if the application is branded and DICE is enabled.
html_source->AddLocalizedString("headerText", IDS_WELCOME_HEADER);
......
chrome/chrome_paks.gni
View file @ b1f8e9a1
......@@ -165,6 +165,10 @@ template("chrome_extra_paks") {
"//ui/file_manager:resources",
]
}
if (!is_android && !is_chromeos) {
sources += [ "$root_gen_dir/chrome/onboarding_welcome_resources.pak" ]
deps += [ "//chrome/browser/resources:onboarding_welcome_resources" ]
}
if (enable_extensions) {
sources += [
"$root_gen_dir/chrome/extensions_resources.pak",
......
tools/gritsettings/resource_ids
View file @ b1f8e9a1
......@@ -122,16 +122,19 @@
"includes": [13280],
},
"chrome/browser/resources/task_scheduler_internals/resources.grd": {
"includes": [13310],
"includes": [13300],
},
"chrome/browser/resources/translate_internals_resources.grd": {
"includes": [13320],
"includes": [13310],
},
"chrome/browser/resources/webapks_ui_resources.grd": {
"includes": [13340],
"includes": [13320],
},
"chrome/browser/resources/welcome/onboarding_welcome/onboarding_welcome_resources.grd": {
"structures": [13330],
},
"chrome/browser/vr/testapp/vr_testapp_resources.grd": {
"includes": [13350],
"includes": [13370],
},
# END chrome/browser section.
......
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