Commit 5f134416 authored by dpapad's avatar dpapad Committed by Commit Bot

WebUI: Auto-generate ui/webui/resources/html/ resources grdp file.

Moving all IDR_WEBUI_HTML_* resources from webui_resources.grd to
the auto-generated webui_generated_resources.grd.

Bug: 1132403
Change-Id: Ib3230803549a8f49f6ee41f2644da3b91954b2b4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2519854
Commit-Queue: dpapad <dpapad@chromium.org>
Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826476}
parent 05be5081
......@@ -12,10 +12,12 @@ generate_grd("build_grd") {
out_grd = "$target_gen_dir/${grd_prefix}_resources.grd"
deps = [
"html:build_grdp",
"js:build_grdp",
"js/cr/ui:build_grdp",
]
grdp_files = [
"$target_gen_dir/html/resources.grdp",
"$target_gen_dir/js/cr/ui/resources.grdp",
"$target_gen_dir/js/resources.grdp",
]
......
......@@ -2,22 +2,6 @@
<!-- Holds various resources under ui/webui/resources/{js,html}, that depend on
Polymer or are Polymer related. -->
<grit-part>
<!-- HTML resources -->
<structure name="IDR_WEBUI_HTML_CR_UI_FOCUS_ROW_BEHAVIOR"
file="html/cr/ui/focus_row_behavior.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_FOCUS_WITHOUT_INK"
file="html/cr/ui/focus_without_ink.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_I18N_BEHAVIOR"
file="html/i18n_behavior.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_LIST_PROPERTY_UPDATE_BEHAVIOR"
file="html/list_property_update_behavior.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_POLYMER"
file="html/polymer.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_WEBUI_LISTENER_BEHAVIOR"
file="html/web_ui_listener_behavior.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_SEARCH_HIGHLIGHT_UTILS"
file="html/search_highlight_utils.html" type="chrome_html" />
<!-- CSS resources -->
<structure name="IDR_WEBUI_CSS_MD_COLORS"
file="css/md_colors.css" type="chrome_html" />
......
# Copyright 2020 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//ui/webui/resources/tools/generate_grd.gni")
include_polymer = !is_android && !is_ios
generate_grd("build_grdp") {
grd_prefix = "webui_html"
out_grd = "$target_gen_dir/resources.grdp"
resource_path_prefix = "html"
input_files = [
"action_link.html",
"assert.html",
"cr/event_target.html",
"cr.html",
"cr/ui/array_data_model.html",
"cr/ui/command.html",
"cr/ui/context_menu_handler.html",
"cr/ui/drag_wrapper.html",
"cr/ui/focus_grid.html",
"cr/ui/focus_manager.html",
"cr/ui/focus_outline_manager.html",
"cr/ui/focus_row.html",
"cr/ui.html",
"cr/ui/keyboard_shortcut_list.html",
"cr/ui/list.html",
"cr/ui/list_item.html",
"cr/ui/list_selection_controller.html",
"cr/ui/list_selection_model.html",
"cr/ui/menu_button.html",
"cr/ui/menu.html",
"cr/ui/menu_item.html",
"cr/ui/overlay.html",
"cr/ui/position_util.html",
"cr/ui/splitter.html",
"cr/ui/store_client.html",
"cr/ui/store.html",
"event_tracker.html",
"icon.html",
"load_time_data.html",
"parse_html_subset.html",
"promise_resolver.html",
"test_loader.html",
"trash.html",
"util.html",
]
if (include_polymer) {
input_files += [
"cr/ui/focus_row_behavior.html",
"cr/ui/focus_without_ink.html",
"i18n_behavior.html",
"list_property_update_behavior.html",
"polymer.html",
"search_highlight_utils.html",
"web_ui_listener_behavior.html",
]
}
input_files_base_dir = rebase_path(".", "//")
}
......@@ -128,13 +128,6 @@ without changes to the corresponding grd file. -->
file="css/widgets.css" type="chrome_html"
flattenhtml="true" />
<structure name="IDR_WEBUI_HTML_ACTION_LINK_HTML"
file="html/action_link.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_ASSERT_HTML"
file="html/assert.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_PROMISE_RESOLVER_HTML"
file="html/promise_resolver.html" type="chrome_html" />
<if expr="chromeos">
<structure name="IDR_WEBUI_CROS_COLORS_CSS"
file="${root_gen_dir}/ui/chromeos/colors/cros_colors.generated.css"
......@@ -142,76 +135,6 @@ without changes to the corresponding grd file. -->
use_base_dir="false" />
</if>
<structure name="IDR_WEBUI_HTML_CR_HTML"
file="html/cr.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_EVENT_TARGET_HTML"
file="html/cr/event_target.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_HTML"
file="html/cr/ui.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_ARRAY_DATA_MODEL_HTML"
file="html/cr/ui/array_data_model.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_COMMAND_HTML"
file="html/cr/ui/command.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_CONTEXT_MENU_HANDLER_HTML"
file="html/cr/ui/context_menu_handler.html"
type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_DRAG_WRAPPER_HTML"
file="html/cr/ui/drag_wrapper.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_FOCUS_GRID_HTML"
file="html/cr/ui/focus_grid.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_FOCUS_MANAGER_HTML"
file="html/cr/ui/focus_manager.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_FOCUS_OUTLINE_MANAGER_HTML"
file="html/cr/ui/focus_outline_manager.html"
type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_FOCUS_ROW_HTML"
file="html/cr/ui/focus_row.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_KEYBOARD_SHORTCUT_LIST_HTML"
file="html/cr/ui/keyboard_shortcut_list.html"
type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_LIST_HTML"
file="html/cr/ui/list.html"
type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_LIST_ITEM_HTML"
file="html/cr/ui/list_item.html"
type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_LIST_SELECTION_CONTROLLER_HTML"
file="html/cr/ui/list_selection_controller.html"
type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_LIST_SELECTION_MODEL_HTML"
file="html/cr/ui/list_selection_model.html"
type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_MENU_HTML"
file="html/cr/ui/menu.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_MENU_BUTTON_HTML"
file="html/cr/ui/menu_button.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_MENU_ITEM_HTML"
file="html/cr/ui/menu_item.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_OVERLAY_HTML"
file="html/cr/ui/overlay.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_POSITION_UTIL_HTML"
file="html/cr/ui/position_util.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_SPLITTER_HTML"
file="html/cr/ui/splitter.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_STORE_HTML"
file="html/cr/ui/store.html"
type="chrome_html" />
<structure name="IDR_WEBUI_HTML_CR_UI_STORE_CLIENT_HTML"
file="html/cr/ui/store_client.html"
type="chrome_html" />
<structure name="IDR_WEBUI_HTML_EVENT_TRACKER_HTML"
file="html/event_tracker.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_ICON_HTML"
file="html/icon.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_LOAD_TIME_DATA_HTML"
file="html/load_time_data.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_PARSE_HTML_SUBSET"
file="html/parse_html_subset.html" type="chrome_html" />
<structure name="IDR_WEBUI_HTML_TEST_LOADER_HTML"
file="html/test_loader.html" type="chrome_html"/>
<structure name="IDR_WEBUI_HTML_UTIL_HTML"
file="html/util.html" type="chrome_html" />
<if expr="is_ios">
<structure name="IDR_WEBUI_JS_IOS_WEB_UI"
file="js/ios/web_ui.js" type="chrome_html" />
......
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