Skip to content

GitLab

T
tangled
Commit 54176ab6 authored by dpapad's avatar dpapad Committed by Chromium LUCI CQ
Browse files
Options

WebUI: Auto-generate grd file for multidevice-internals. 

Bug: 1132403
Change-Id: If07572c8f064b419c38335a767e19db5504a28c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2578711
Commit-Queue: dpapad <dpapad@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835125}
parent e89dba74
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 108 deletions
chrome/browser/resources/BUILD.gn
View file @ 54176ab6
...@@ -37,10 +37,10 @@ group("resources") { ...@@ -37,10 +37,10 @@ group("resources") {
if (is_chromeos) { if (is_chromeos) {
public_deps += [ public_deps += [
":bluetooth_pairing_dialog_resources", ":bluetooth_pairing_dialog_resources",
":multidevice_internals_resources",
"chromeos:cellular_setup_resources", "chromeos:cellular_setup_resources",
"chromeos:multidevice_setup_resources", "chromeos:multidevice_setup_resources",
"chromeos/accessibility:build", "chromeos/accessibility:build",
"chromeos/multidevice_internals:resources",
"nearby_internals:nearby_internals_resources", "nearby_internals:nearby_internals_resources",
"nearby_share:nearby_share_dialog_resources", "nearby_share:nearby_share_dialog_resources",
"settings/chromeos:os_settings_resources", "settings/chromeos:os_settings_resources",
...@@ -263,22 +263,6 @@ if (!is_android) { ...@@ -263,22 +263,6 @@ if (!is_android) {
} }
if (is_chromeos_ash) { if (is_chromeos_ash) {
grit("multidevice_internals_resources") {
source =
"chromeos/multidevice_internals/multidevice_internals_resources.grd"
deps = [ "//chrome/browser/resources/chromeos/multidevice_internals:web_components" ]
defines = chrome_grit_defines
outputs = [
"grit/multidevice_internals_resources.h",
"grit/multidevice_internals_resources_map.cc",
"grit/multidevice_internals_resources_map.h",
"multidevice_internals_resources.pak",
]
output_dir = "$root_gen_dir/chrome"
}
grit("bluetooth_pairing_dialog_resources") { grit("bluetooth_pairing_dialog_resources") {
defines = chrome_grit_defines defines = chrome_grit_defines
......
chrome/browser/resources/chromeos/multidevice_internals/BUILD.gn
View file @ 54176ab6
...@@ -3,7 +3,65 @@ ...@@ -3,7 +3,65 @@
# found in the LICENSE file. # found in the LICENSE file.
import("//third_party/closure_compiler/compile_js.gni") import("//third_party/closure_compiler/compile_js.gni")
import("//tools/grit/grit_rule.gni")
import("//tools/polymer/html_to_js.gni") import("//tools/polymer/html_to_js.gni")
import("//ui/webui/resources/tools/generate_grd.gni")
resources_grd_file = "$target_gen_dir/resources.grd"
generated_grdp_file = "$target_gen_dir/gen_resources.grdp"
generate_grd("build_grd") {
grd_prefix = "multidevice_internals"
out_grd = resources_grd_file
input_files = [
"i18n_setup.js",
"index.html",
"multidevice_logs_browser_proxy.js",
"multidevice_phonehub_browser_proxy.js",
"types.js",
]
input_files_base_dir = rebase_path(".", "//")
grdp_files = [ generated_grdp_file ]
deps = [ ":build_grdp" ]
}
generate_grd("build_grdp") {
grd_prefix = "multidevice_internals"
out_grd = generated_grdp_file
input_files_base_dir = rebase_path(target_gen_dir, root_build_dir)
input_files = [
"browser_tabs_metadata_form.js",
"browser_tabs_model_form.js",
"logging_tab.js",
"log_object.js",
"multidevice_internals.js",
"notification_form.js",
"notification_manager.js",
"phonehub_tab.js",
"phone_name_form.js",
"phone_status_model_form.js",
"quick_action_controller_form.js",
"shared_style.js",
]
}
grit("resources") {
enable_input_discovery_for_gn_analyze = false
source = resources_grd_file
deps = [
":build_grd",
":web_components",
]
outputs = [
"grit/multidevice_internals_resources.h",
"grit/multidevice_internals_resources_map.cc",
"grit/multidevice_internals_resources_map.h",
"multidevice_internals_resources.pak",
]
output_dir = "$root_gen_dir/chrome"
}
js_type_check("closure_compile") { js_type_check("closure_compile") {
is_polymer3 = true is_polymer3 = true
......
chrome/browser/resources/chromeos/multidevice_internals/multidevice_internals_resources.grd deleted 100644 → 0
View file @ e89dba74
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<outputs>
<output filename="grit/multidevice_internals_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="grit/multidevice_internals_resources_map.cc"
type="resource_file_map_source" />
<output filename="grit/multidevice_internals_resources_map.h"
type="resource_map_header" />
<output filename="multidevice_internals_resources.pak" type="data_package" />
</outputs>
<release seq="1">
<includes>
<include name="IDR_MULTIDEVICE_INTERNALS_BROWSER_TABS_METADATA_FORM_JS"
file="${root_gen_dir}\chrome\browser\resources\chromeos\multidevice_internals\browser_tabs_metadata_form.js"
use_base_dir="false"
type="BINDATA"/>
<include name="IDR_MULTIDEVICE_INTERNALS_BROWSER_TABS_MODEL_FORM_JS"
file="${root_gen_dir}\chrome\browser\resources\chromeos\multidevice_internals\browser_tabs_model_form.js"
use_base_dir="false"
type="BINDATA"/>
<include name="IDR_MULTIDEVICE_INTERNALS_BROWSER_NOTIFICATION_MANAGER_JS"
file="${root_gen_dir}\chrome\browser\resources\chromeos\multidevice_internals\notification_manager.js"
use_base_dir="false"
type="BINDATA"/>
<include name="IDR_MULTIDEVICE_INTERNALS_BROWSER_NOTIFICATION_FORM_JS"
file="${root_gen_dir}\chrome\browser\resources\chromeos\multidevice_internals\notification_form.js"
use_base_dir="false"
type="BINDATA"/>
<include name="IDR_MULTIDEVICE_INTERNALS_INDEX_HTML"
file="index.html"
type="BINDATA"/>
<include name="IDR_MULTIDEVICE_INTERNALS_I18N_SETUP_JS"
file="i18n_setup.js"
type="BINDATA"/>
<include name="IDR_MULTIDEVICE_INTERNALS_LOG_OBJECT_JS"
file="${root_gen_dir}\chrome\browser\resources\chromeos\multidevice_internals\log_object.js"
use_base_dir="false"
type="BINDATA"/>
<include name="IDR_MULTIDEVICE_INTERNALS_LOGGING_TAB_JS"
file="${root_gen_dir}\chrome\browser\resources\chromeos\multidevice_internals\logging_tab.js"
use_base_dir="false"
type="BINDATA"/>
<include name="IDR_MULTIDEVICE_INTERNALS_MULTIDEVICE_INTERNALS_JS"
file="${root_gen_dir}\chrome\browser\resources\chromeos\multidevice_internals\multidevice_internals.js"
use_base_dir="false"
type="BINDATA"/>
<include name="IDR_MULTIDEVICE_INTERNALS_MULTIDEVICE_LOGS_BROWSER_PROXY_JS"
file="multidevice_logs_browser_proxy.js"
type="BINDATA"/>
<include name="IDR_MULTIDEVICE_INTERNALS_MULTIDEVICE_PHONEHUB_BROWSER_PROXY_JS"
file="multidevice_phonehub_browser_proxy.js"
type="BINDATA"/>
<include name="IDR_MULTIDEVICE_INTERNALS_PHONEHUB_TAB_JS"
file="${root_gen_dir}\chrome\browser\resources\chromeos\multidevice_internals\phonehub_tab.js"
use_base_dir="false"
type="BINDATA"/>
<include name="IDR_MULTIDEVICE_INTERNALS_PHONE_NAME_FORM_JS"
file="${root_gen_dir}\chrome\browser\resources\chromeos\multidevice_internals\phone_name_form.js"
use_base_dir="false"
type="BINDATA"/>
<include name="IDR_MULTIDEVICE_INTERNALS_PHONE_STATUS_MODEL_FORM_JS"
file="${root_gen_dir}\chrome\browser\resources\chromeos\multidevice_internals\phone_status_model_form.js"
use_base_dir="false"
type="BINDATA"/>
<include name="IDR_MULTIDEVICE_INTERNALS_QUICK_ACTION_CONTROLLER_FORM_JS"
file="${root_gen_dir}\chrome\browser\resources\chromeos\multidevice_internals\quick_action_controller_form.js"
use_base_dir="false"
type="BINDATA"/>
<include name="IDR_MULTIDEVICE_INTERNALS_SHARED_STYLE_JS"
file="${root_gen_dir}\chrome\browser\resources\chromeos\multidevice_internals\shared_style.js"
use_base_dir="false"
type="BINDATA"/>
<include name="IDR_MULTIDEVICE_INTERNALS_TYPES_JS"
file="types.js"
type="BINDATA"/>
</includes>
</release>
</grit>
chrome/browser/ui/webui/chromeos/multidevice_internals/multidevice_internals_ui.cc
View file @ 54176ab6
...@@ -19,13 +19,6 @@ ...@@ -19,13 +19,6 @@
namespace chromeos { namespace chromeos {
namespace {
constexpr char kMultideviceInternalsGeneratedPath[] =
"@out_folder@/gen/chrome/browser/resources/chromeos/multidevice_internals/";
} // namespace
MultideviceInternalsUI::MultideviceInternalsUI(content::WebUI* web_ui) MultideviceInternalsUI::MultideviceInternalsUI(content::WebUI* web_ui)
: ui::MojoWebUIController(web_ui, /*enable_chrome_send=*/true) { : ui::MojoWebUIController(web_ui, /*enable_chrome_send=*/true) {
content::WebUIDataSource* html_source = content::WebUIDataSource::Create( content::WebUIDataSource* html_source = content::WebUIDataSource::Create(
...@@ -36,7 +29,7 @@ MultideviceInternalsUI::MultideviceInternalsUI(content::WebUI* web_ui) ...@@ -36,7 +29,7 @@ MultideviceInternalsUI::MultideviceInternalsUI(content::WebUI* web_ui)
html_source, html_source,
base::make_span(kMultideviceInternalsResources, base::make_span(kMultideviceInternalsResources,
kMultideviceInternalsResourcesSize), kMultideviceInternalsResourcesSize),
kMultideviceInternalsGeneratedPath, IDR_MULTIDEVICE_INTERNALS_INDEX_HTML); "", IDR_MULTIDEVICE_INTERNALS_INDEX_HTML);
content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), html_source); content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), html_source);
web_ui->AddMessageHandler( web_ui->AddMessageHandler(
......
chrome/chrome_paks.gni
View file @ 54176ab6
...@@ -198,9 +198,9 @@ template("chrome_extra_paks") { ...@@ -198,9 +198,9 @@ template("chrome_extra_paks") {
deps += [ deps += [
"//ash/public/cpp/resources:ash_public_unscaled_resources", "//ash/public/cpp/resources:ash_public_unscaled_resources",
"//chrome/browser/resources:bluetooth_pairing_dialog_resources", "//chrome/browser/resources:bluetooth_pairing_dialog_resources",
"//chrome/browser/resources:multidevice_internals_resources",
"//chrome/browser/resources/chromeos:cellular_setup_resources", "//chrome/browser/resources/chromeos:cellular_setup_resources",
"//chrome/browser/resources/chromeos:multidevice_setup_resources", "//chrome/browser/resources/chromeos:multidevice_setup_resources",
"//chrome/browser/resources/chromeos/multidevice_internals:resources",
"//chrome/browser/resources/nearby_internals:nearby_internals_resources", "//chrome/browser/resources/nearby_internals:nearby_internals_resources",
"//chrome/browser/resources/nearby_share:nearby_share_dialog_resources", "//chrome/browser/resources/nearby_share:nearby_share_dialog_resources",
"//chrome/browser/resources/settings/chromeos:os_settings_resources", "//chrome/browser/resources/settings/chromeos:os_settings_resources",
......
tools/gritsettings/resource_ids.spec
View file @ 54176ab6
...@@ -113,9 +113,9 @@ ...@@ -113,9 +113,9 @@
"chrome/browser/resources/chromeos/cellular_setup/cellular_setup_resources.grd": { "chrome/browser/resources/chromeos/cellular_setup/cellular_setup_resources.grd": {
"structures": [1360], "structures": [1360],
}, },
"chrome/browser/resources/chromeos/multidevice_internals/multidevice_internals_resources.grd": { "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/chromeos/multidevice_internals/resources.grd": {
"META": {"sizes": {"includes": [35]}},
"includes": [1370], "includes": [1370],
"structures": [1380],
}, },
"chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_resources.grd": { "chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_resources.grd": {
"structures": [1400], "structures": [1400],
......
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