Commit 31369a24 authored by Samuel Huang's avatar Samuel Huang Committed by Commit Bot

[DevUI DFM] Create section for WebUI resources in main resource_ids.

We will add ~45 DevUI pages to the DevUI DFM. Each of these has an
"atomic" PAK file, and an entry in the main resource_ids file. This CL
rearranges existing items in the main resource_ids file in preparation:
* Move bluetooth_internals and usb_internals resources to a new
  section: "/chrome WebUI section".
* Extract ios/web/ section from ios/ section, since there's a
  restriction for ios/web/ to start from same IDs as content/.
* Move content/ section between ios/ and ios/web/. This order makes it
  easier for semi-automated tools to extract structure.

Bug: 927131
Change-Id: I35b32a88f56cfd4437a9bd66fda08e1156fc7d97
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1832443Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#701290}
parent 1ab99b43
...@@ -83,91 +83,94 @@ ...@@ -83,91 +83,94 @@
"includes": [11000], "includes": [11000],
"structures": [11800], "structures": [11800],
}, },
"chrome/browser/resources/bluetooth_internals/resources.grd": {
"includes": [11870],
},
"chrome/browser/resources/chromeos/camera/camera_resources.grd": { "chrome/browser/resources/chromeos/camera/camera_resources.grd": {
"includes": [11930], "includes": [11870],
"structures": [11990], "structures": [11930],
}, },
"chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd": { "chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd": {
"messages": [12030], "messages": [11970],
}, },
"chrome/browser/resources/chromeos/cellular_setup/cellular_setup_resources.grd": { "chrome/browser/resources/chromeos/cellular_setup/cellular_setup_resources.grd": {
"structures": [12100], "structures": [12040],
}, },
"chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_resources.grd": { "chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_resources.grd": {
"structures": [12110], "structures": [12050],
}, },
"chrome/browser/resources/component_extension_resources.grd": { "chrome/browser/resources/component_extension_resources.grd": {
"includes": [12120], "includes": [12060],
"structures": [12260], "structures": [12200],
}, },
"chrome/browser/resources/downloads/downloads_resources_vulcanized.grd": { "chrome/browser/resources/downloads/downloads_resources_vulcanized.grd": {
"includes": [12300], "includes": [12240],
}, },
"chrome/browser/resources/downloads/downloads_resources.grd": { "chrome/browser/resources/downloads/downloads_resources.grd": {
"includes": [12310], "includes": [12250],
"structures": [12320], "structures": [12260],
}, },
"chrome/browser/resources/extensions/extensions_resources_vulcanized.grd": { "chrome/browser/resources/extensions/extensions_resources_vulcanized.grd": {
"includes": [12400], "includes": [12340],
}, },
"chrome/browser/resources/extensions/extensions_resources.grd": { "chrome/browser/resources/extensions/extensions_resources.grd": {
"structures": [12410], "structures": [12350],
}, },
"chrome/browser/resources/invalidations_resources.grd": { "chrome/browser/resources/invalidations_resources.grd": {
"includes": [12500], "includes": [12440],
}, },
"chrome/browser/resources/local_ntp/local_ntp_resources.grd": { "chrome/browser/resources/local_ntp/local_ntp_resources.grd": {
"includes": [12540], "includes": [12480],
}, },
"chrome/browser/resources/net_internals/net_internals_resources.grd": { "chrome/browser/resources/net_internals/net_internals_resources.grd": {
"includes": [12600], "includes": [12540],
}, },
"chrome/browser/resources/print_preview/print_preview_resources_vulcanized.grd": { "chrome/browser/resources/print_preview/print_preview_resources_vulcanized.grd": {
"includes": [12610], "includes": [12550],
}, },
"chrome/browser/resources/print_preview/print_preview_resources.grd": { "chrome/browser/resources/print_preview/print_preview_resources.grd": {
"structures": [12620], "structures": [12560],
}, },
"chrome/browser/resources/quota_internals/quota_internals_resources.grd": { "chrome/browser/resources/quota_internals/quota_internals_resources.grd": {
"includes": [12810], "includes": [12750],
}, },
"chrome/browser/resources/settings/os_settings_resources_vulcanized.grd": { "chrome/browser/resources/settings/os_settings_resources_vulcanized.grd": {
"includes": [12830], "includes": [12770],
}, },
"chrome/browser/resources/settings/os_settings_resources.grd": { "chrome/browser/resources/settings/os_settings_resources.grd": {
"structures": [12840], "structures": [12780],
}, },
"chrome/browser/resources/settings/settings_resources_vulcanized.grd": { "chrome/browser/resources/settings/settings_resources_vulcanized.grd": {
"includes": [13340], "includes": [13280],
}, },
"chrome/browser/resources/settings/settings_resources.grd": { "chrome/browser/resources/settings/settings_resources.grd": {
"structures": [13350], "structures": [13290],
}, },
"chrome/browser/resources/sync_file_system_internals/sync_file_system_internals_resources.grd": { "chrome/browser/resources/sync_file_system_internals/sync_file_system_internals_resources.grd": {
"includes": [13860], "includes": [13800],
}, },
"chrome/browser/resources/tab_strip/tab_strip_resources.grd": { "chrome/browser/resources/tab_strip/tab_strip_resources.grd": {
"structures": [13880], "structures": [13820],
"includes": [13900], "includes": [13840],
},
"chrome/browser/resources/usb_internals/resources.grd": {
"includes": [13910],
}, },
"chrome/browser/resources/webapks/webapks_ui_resources.grd": { "chrome/browser/resources/webapks/webapks_ui_resources.grd": {
"includes": [13920], "includes": [13850],
}, },
"chrome/browser/resources/welcome/welcome_resources.grd": { "chrome/browser/resources/welcome/welcome_resources.grd": {
"includes": [13930], "includes": [13860],
"structures": [13980], "structures": [13910],
}, },
"chrome/browser/vr/testapp/vr_testapp_resources.grd": { "chrome/browser/vr/testapp/vr_testapp_resources.grd": {
"includes": [14020], "includes": [13950],
}, },
# END chrome/browser section. # END chrome/browser section.
# START chrome/ WebUI resources section
"chrome/browser/resources/bluetooth_internals/resources.grd": {
"includes": [13970],
},
"chrome/browser/resources/usb_internals/resources.grd": {
"includes": [14030],
},
# END chrome/ WebUI resources section
# START chrome/ miscellaneous section. # START chrome/ miscellaneous section.
"chrome/common/common_resources.grd": { "chrome/common/common_resources.grd": {
"includes": [14160], "includes": [14160],
...@@ -232,25 +235,6 @@ ...@@ -232,25 +235,6 @@
}, },
# END components/ section. # END components/ section.
# START content/ section.
# content/ and ios/web/ must start at the same id.
# App only use one file depending on whether it is iOS or other platform.
"content/app/resources/content_resources.grd": {
"structures": [20000],
},
"content/content_resources.grd": {
"includes": [20400],
},
"content/shell/shell_resources.grd": {
"includes": [20500],
},
# This file is generated during the build.
"<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd": {
"includes": [20550],
},
# END content/ section.
# START ios/ section. # START ios/ section.
# #
# chrome/ and ios/chrome/ must start at the same id. # chrome/ and ios/chrome/ must start at the same id.
...@@ -294,7 +278,28 @@ ...@@ -294,7 +278,28 @@
"ios/chrome/content_widget_extension/strings/ios_content_widget_extension_google_chrome_strings.grd": { "ios/chrome/content_widget_extension/strings/ios_content_widget_extension_google_chrome_strings.grd": {
"messages": [3080], "messages": [3080],
}, },
# END ios/ section.
# START content/ section.
# content/ and ios/web/ must start at the same id.
# App only use one file depending on whether it is iOS or other platform.
"content/app/resources/content_resources.grd": {
"structures": [20000],
},
"content/content_resources.grd": {
"includes": [20400],
},
"content/shell/shell_resources.grd": {
"includes": [20500],
},
# This file is generated during the build.
"<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd": {
"includes": [20550],
},
# END content/ section.
# START ios/web/ section.
# content/ and ios/web/ must start at the same id. # content/ and ios/web/ must start at the same id.
# App only use one file depending on whether it is iOS or other platform. # App only use one file depending on whether it is iOS or other platform.
"ios/web/ios_web_resources.grd": { "ios/web/ios_web_resources.grd": {
...@@ -303,7 +308,7 @@ ...@@ -303,7 +308,7 @@
"ios/web/test/test_resources.grd": { "ios/web/test/test_resources.grd": {
"includes": [22000], "includes": [22000],
}, },
# END ios/ section. # END ios/web/ section.
# START "everything else" section. # START "everything else" section.
# Everything but chrome/, components/, content/, and ios/ # Everything but chrome/, components/, content/, and ios/
......
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