grit: Reorganize and compact resource_ids.

tools/gritsettings/resource_ids

Index: tools/gritsettings/resource_ids
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index 6a8cf6d115e684d6a338f40383c8458021c2421b..d8604f34904c8c4030f1d08ef1bc20311874cfbd 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -7,294 +7,348 @@
 # across all the grd files.  If you are adding a new grd file, please add
 # a new entry to this file.
 #
-# The first entry in the file, SRCDIR, is special: It is a relative path from
-# this file to the base of your checkout.
+# The entries below are organized into sections. When adding new entries,
+# please use the right section. Try to keep entries in alphabetical order.
+#
+# - chrome/app/
+# - chrome/browser/
+# - chrome/ miscellaneous
+# - components/
+# - content/
+# - ios/ (overlaps with content/)

[sdefresne, 2016/10/20 14:59:55]

This separation is a bit problematic for iOS. It works, but limit how many
resources we can use. Also the everything else is a bit strange that includes
things iOS depends (ui/, net/) and thing it does not depends (android, ash,
...).

As iOS can overlap with anything it does not depends on, could we have the
following sections (in that order, which I know is not alphabetic, but more
topological):

- net/
- ui/
- components/
- ios/ (can overlap all sections below)
- contents/
- chrome/app
- chrome/browser/
- chrome/ miscellaneous
- everything else

I think that as is, this will work as downstream code only use 31000-36000 for
it's idea, but it will make our life harder for upstreaming. The ordering I
suggest would make it easier (though it is probably much more work for you).

[Lei Zhang, 2016/10/20 20:53:56]

Right, so I haven't worked downstream in a while and no longer have access to
the code, so no peeking for me.

If everything gets upstreamed, would it all go into ios/ or would some parts end
up elsewhere like in components/ ?

Maybe ios/ should not overlap with contents/ but overlap with chrome/ instead.
There is a huge chunk below id 10000, and that should be enough for everything
ios/.

+# - everything else
 #
 # The range of ID values, which is used by pak files, is from 0 to 2^16 - 1.
 {
+  # The first entry in the file, SRCDIR, is special: It is a relative path from
+  # this file to the base of your checkout.
   "SRCDIR": "../..",
 
-  "chrome/browser/browser_resources.grd": {
-    "includes": [400],
-    "structures": [850],
+  # Previous versions of this file started with resource id 400, so stick with
+  # that.
+  #
+  # START chrome/app section.
+  "chrome/app/address_input_strings.grd": {
+    "messages": [400],
   },
-  "chrome/browser/resources/component_extension_resources.grd": {
-    "includes": [1000],
-    "structures": [1450],
+
+  # Chromium strings and Google Chrome strings must start at the same id.
+  # We only use one file depending on whether we're building Chromium or
+  # Google Chrome.
+  "chrome/app/chromium_strings.grd": {
+    "messages": [500],
   },
-  "chrome/browser/resources/net_internals_resources.grd": {
-    "includes": [1500],
+  "chrome/app/google_chrome_strings.grd": {
+    "messages": [500],
   },
-  "ui/webui/resources/webui_resources.grd": {
-    "includes": [2000],
-    "structures": [2200],
+
+  # Leave lots of space for generated_resources since it has most of our
+  # strings.
+  "chrome/app/generated_resources.grd": {
+    "messages": [900],
   },
-  "chrome/common/common_resources.grd": {
-    "includes": [3000],
+
+  "chrome/app/resources/locale_settings.grd": {
+    "messages": [10000],
   },
-  "chrome/renderer/resources/renderer_resources.grd": {
-    "includes": [3500],
-    "structures": [3700],
+
+  # These each start with the same resource id because we only use one
+  # file for each build (chromiumos, google_chromeos, linux, mac, or win).
+  "chrome/app/resources/locale_settings_chromiumos.grd": {
+    "messages": [10100],
   },
-  "net/base/net_resources.grd": {
-    "includes": [4000],
+  "chrome/app/resources/locale_settings_google_chromeos.grd": {
+    "messages": [10100],
   },
-  "ui/resources/ui_unscaled_resources.grd": {
-    "includes": [4500],
+  "chrome/app/resources/locale_settings_linux.grd": {
+    "messages": [10100],
   },
-  "content/app/resources/content_resources.grd": {
-    "structures": [4700],
+  "chrome/app/resources/locale_settings_mac.grd": {
+    "messages": [10100],
   },
-  "third_party/WebKit/public/blink_image_resources.grd": {
-    "structures": [4750],
+  "chrome/app/resources/locale_settings_win.grd": {
+    "messages": [10100],
   },
-  "ui/resources/ui_resources.grd": {
-    "structures": [5500],
+
+  "chrome/app/theme/chrome_unscaled_resources.grd": {
+    "includes": [10150],
   },
-  "ui/app_list/resources/app_list_resources.grd": {
-    "structures": [5760],
+
+  # Leave space for theme_resources since it has many structures.
+  "chrome/app/theme/theme_resources.grd": {
+    "structures": [10200],
   },
-  "ui/views/resources/views_resources.grd": {
-    "structures": [5800],
+  # END chrome/app section.
+
+  # START chrome/browser section.
+  "chrome/browser/browser_resources.grd": {
+    "includes": [11000],
+    "structures": [11450],
   },
-  "ash/resources/ash_resources.grd": {
-    "includes": [6100],
-    "structures": [6150],
+  "chrome/browser/resources/component_extension_resources.grd": {
+    "includes": [11550],
+    "structures": [11800],
   },
-  "ui/keyboard/keyboard_resources.grd": {
-    "includes": [6850],
+  "chrome/browser/resources/invalidations_resources.grd": {
+    "includes": [11850],
   },
-  "chrome/app/theme/theme_resources.grd": {
-    "structures": [7000],
+  "chrome/browser/resources/md_policy/policy_resources.grd": {
+    "structures": [11860],
   },
-  "chrome/app/theme/chrome_unscaled_resources.grd": {
-    "includes": [8000],
+  "chrome/browser/resources/net_internals_resources.grd": {
+    "includes": [11900],
   },
-  "ui/strings/app_locale_settings.grd": {
-    "messages": [9000],
+  "chrome/browser/resources/options_resources.grd": {
+    "includes": [11910],
+    "structures": [11920],
   },
-  "chrome/app/resources/locale_settings.grd": {
-    "messages": [9500],
+  "chrome/browser/resources/options_test_resources.grd": {
+    "structures": [11950],
   },
-  # These each start with the same resource id because we only use one
-  # file for each build (chromiumos, google_chromeos, linux, mac, or win).
-  "chrome/app/resources/locale_settings_chromiumos.grd": {
-    "messages": [10500],
+  "chrome/browser/resources/password_manager_internals_resources.grd": {
+    "includes": [11960],
   },
-  "chrome/app/resources/locale_settings_google_chromeos.grd": {
-    "messages": [10500],
+  "chrome/browser/resources/quota_internals_resources.grd": {
+    "includes": [11970],
   },
-  "chrome/app/resources/locale_settings_linux.grd": {
-    "messages": [10500],
+  "chrome/browser/resources/settings/settings_resources.grd": {
+    "structures": [12000],
   },
-  "chrome/app/resources/locale_settings_mac.grd": {
-    "messages": [10500],
+  "chrome/browser/resources/sync_file_system_internals_resources.grd": {
+    "includes": [12500],
   },
-  "chrome/app/resources/locale_settings_win.grd": {
-    "messages": [10500],
+  "chrome/browser/resources/task_scheduler_internals/resources.grd": {
+    "includes": [12530],
   },
-  "ui/strings/ui_strings.grd": {
-    "messages": [11000],
+  "chrome/browser/resources/translate_internals_resources.grd": {
+    "includes": [12540],
   },
+  # END chrome/browser section.
+
+  # START chrome/ miscellaneous section.
+  "chrome/common/common_resources.grd": {
+    "includes": [12700],
+  },
+  "chrome/renderer/resources/renderer_resources.grd": {
+    "includes": [12710],
+    "structures": [12790],
+  },
+  "chrome/test/data/webui_test_resources.grd": {
+    "includes": [12800],
+  },
+  # END chrome/ miscellaneous section.
+
+  # START components/ section.
+  #
   # Chromium strings and Google Chrome strings must start at the same id.
   # We only use one file depending on whether we're building Chromium or
   # Google Chrome.
-  "chrome/app/chromium_strings.grd": {
-    "messages": [11200],
-  },
-  "chrome/app/google_chrome_strings.grd": {
-    "messages": [11200],
-  },
-  # Leave lots of space for generated_resources since it has most of our
-  # strings.
-  "chrome/app/generated_resources.grd": {
-    "structures": [11700],
-    "messages": [12200],
+  "components/components_chromium_strings.grd": {
+    "messages": [15000],
   },
-  "content/app/strings/content_strings.grd": {
-    "messages": [19300],
+  "components/components_google_chrome_strings.grd": {
+    "messages": [15000],
   },
-  "components/policy/resources/policy_templates.grd": {
-    "structures": [20100],
-    "messages": [20110],
+
+  "components/components_locale_settings.grd": {
+    "includes": [15020],
+    "messages": [15030],
   },
-  "chrome/browser/resources/invalidations_resources.grd": {
-    "includes": [21100],
+  "components/components_strings.grd": {
+    "messages": [15040],
   },
-  # This file is generated during the build.
-  "<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd": {
-    "includes": [21150],
+  "components/chrome_apps/chrome_apps_resources.grd": {
+    "includes": [15900],
   },
-  "devtools_resources.grd": {
-    "includes": [21150],
+  "components/policy/resources/policy_templates.grd": {
+    "structures": [15920],
   },
-  "chrome/browser/resources/options_resources.grd": {
-    "includes": [22150],
-    "structures": [22350],
+  "components/resources/components_resources.grd": {
+    "includes": [15930],
   },
-  "chrome/browser/resources/options_test_resources.grd": {
-    "includes": [22550],
-    "structures": [22590],
+  "components/resources/components_scaled_resources.grd": {
+    "structures": [16050],
   },
-  "chrome/test/data/webui_test_resources.grd": {
-    "includes": [22630],
-    "structures": [22640],
+  # END components/ section.
+
+  # START content/ section.
+  # content/ and ios/ 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],
   },
-  "chrome/browser/resources/quota_internals_resources.grd": {
-    "includes": [22950],
+  "content/app/strings/content_strings.grd": {
+    "messages": [20100],
   },
   "content/content_resources.grd": {
-    "includes": [23650],
-  },
-  # ios_web strings and content strings must start at the same id.
-  # App only use one file depending on whether it is iOS or other platform.
-  "ios/web/ios_web_resources.grd": {
-    "includes": [23650],
-  },
-  # ios/web test strings and content/shell strings must start at the same id.
-  # App only use one file depending on whether it is iOS or other platform.
-  "ios/web/test/test_resources.grd": {
-    "includes": [24150],
+    "includes": [20400],
   },
   "content/shell/shell_resources.grd": {
-    "includes": [24150],
+    "includes": [20500],
   },
+
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd": {
-    "includes": [24300],
+    "includes": [20550],
   },
-  # iOS resources overlap with android_webview, ash, chromeos and extensions_api,
-  # as these are not used on iOS.
-  "ios/chrome/app/strings/ios_strings.grd": {
-    "messages": [24550],
+  # END content/ section.
+
+  # START ios/ section.
+  #
+  # content/ and ios/ must start at the same id.
+  # App only use one file depending on whether it is iOS or other platform.
+  "ios/chrome/app/resources/ios_resources.grd": {
+    "includes": [20000],
+    "structures": [20300],
   },
+
   # Chromium strings and Google Chrome strings must start at the same id.
   # We only use one file depending on whether we're building Chromium or
   # Google Chrome.
   "ios/chrome/app/strings/ios_chromium_strings.grd": {
-    "messages": [25455],
+    "messages": [20450],
   },
   "ios/chrome/app/strings/ios_google_chrome_strings.grd": {
-    "messages": [25455],
+    "messages": [20450],
   },
-  "ios/chrome/app/resources/ios_resources.grd": {
-    "structures": [25650],
-    "includes": [25760],
+
+  "ios/chrome/app/strings/ios_strings.grd": {
+    "messages": [20650],
   },
   "ios/chrome/app/theme/ios_theme_resources.grd": {
-    "structures": [25570],
+    "structures": [20750],
   },
   "ios/chrome/share_extension/strings/ios_share_extension_strings.grd": {
-    "messages": [26025],
+    "messages": [20850],
   },
   "ios/chrome/today_extension/strings/ios_today_extension_strings.grd": {
-    "messages": [26035],
+    "messages": [20860],
   },
-  "ash/ash_strings.grd": {
-    "messages": [24550],
+  "ios/web/ios_web_resources.grd": {
+    "includes": [20890],
+  },
+  "ios/web/test/test_resources.grd": {
+    "includes": [20920],
   },
+  # END ios/ section.
+
+  # START "everything else" section.
+  # Everything but chrome/, components/, content/, and ios/
   "android_webview/ui/aw_resources.grd": {
-    "includes": [24550],
+    "includes": [23500],
   },
   "android_webview/ui/aw_strings.grd": {
-    "messages": [24650],
+    "messages": [23510],
   },
-  "ui/chromeos/resources/ui_chromeos_resources.grd": {
-    "structures": [24850],
+
+  "ash/ash_strings.grd": {
+    "messages": [23520],
   },
-  "ui/chromeos/ui_chromeos_strings.grd": {
-    "messages": [24950],
+  "ash/resources/ash_resources.grd": {
+    "structures": [23920],
   },
-  "extensions/extensions_resources.grd": {
-    "includes": [25250],
+
+  "blimp/client/support/resources/blimp_strings.grd": {
+    "messages": [24200],
   },
-  "extensions/browser/resources/extensions_browser_resources.grd": {
-    "structures": [25450],
+  "blimp/engine/app/blimp_browser_resources.grd": {
+    "includes": [24250],
   },
-  "extensions/renderer/resources/extensions_renderer_resources.grd": {
-    "includes": [25500],
-    "structures": [25600],
+
+  "chromecast/browser/cast_browser_resources.grd": {
+    "includes": [24300],
   },
-  "extensions/strings/extensions_strings.grd": {
-    "messages": [25650],
+
+  "device/bluetooth/bluetooth_strings.grd": {
+    "messages": [24400],
   },
-  "extensions/shell/app_shell_resources.grd": {
-    "includes": [26050],
+
+  "extensions/browser/resources/extensions_browser_resources.grd": {
+    "structures": [24450],
   },
-  "chrome/browser/resources/password_manager_internals_resources.grd": {
-    "includes": [26350],
+  "extensions/extensions_resources.grd": {
+    "includes": [24460],
   },
-  "device/bluetooth/bluetooth_strings.grd": {
-    "messages": [26650],
+  "extensions/renderer/resources/extensions_renderer_resources.grd": {
+    "includes": [24470],
+    "structures": [24600],
   },
-  "ui/file_manager/file_manager_resources.grd": {
-    "includes": [26760],
+  "extensions/shell/app_shell_resources.grd": {
+    "includes": [24610],
   },
-  "components/chrome_apps/chrome_apps_resources.grd": {
-    "includes": [26977],
+  "extensions/strings/extensions_strings.grd": {
+    "messages": [24620],
   },
-  "ui/login/login_resources.grd": {
-    "includes": [26990],
+
+  "headless/lib/resources/headless_lib_resources.grd": {
+    "includes": [24700],
   },
-  "chrome/browser/resources/translate_internals_resources.grd": {
-    "includes": [27000],
+
+  "net/base/net_resources.grd": {
+    "includes": [24750],
   },
-  "chrome/browser/resources/sync_file_system_internals_resources.grd": {
-    "includes": [27010],
+
+  "remoting/resources/remoting_strings.grd": {
+    "messages": [24800],
   },
-  "chrome/app/address_input_strings.grd": {
-    "messages": [27110],
+
+  "third_party/WebKit/public/blink_image_resources.grd": {
+    "structures": [25300],
   },
-  "remoting/resources/remoting_strings.grd": {
-    "messages": [27560],
+  "third_party/WebKit/public/blink_resources.grd": {
+    "includes": [25400],
   },
-  "components/components_locale_settings.grd": {
-    "includes": [28010],
-    "messages": [28015],
+
+  "ui/app_list/resources/app_list_resources.grd": {
+    "structures": [25800],
   },
-  "components/components_strings.grd": {
-    "messages": [28020],
+  "ui/chromeos/resources/ui_chromeos_resources.grd": {
+    "structures": [25820],
   },
-  "chrome/browser/resources/task_scheduler_internals/resources.grd": {
-    "includes": [29000],
+  "ui/chromeos/ui_chromeos_strings.grd": {
+    "messages": [25920],
   },
-  # Chromium strings and Google Chrome strings must start at the same id.
-  # We only use one file depending on whether we're building Chromium or
-  # Google Chrome.
-  "components/components_chromium_strings.grd": {
-    "messages": [29280],
+  "ui/file_manager/file_manager_resources.grd": {
+    "includes": [26150],
   },
-  "components/components_google_chrome_strings.grd": {
-    "messages": [29280],
+  "ui/keyboard/keyboard_resources.grd": {
+    "includes": [26400],
   },
-  "components/resources/components_resources.grd": {
-    "includes": [29330],
+  "ui/login/login_resources.grd": {
+    "includes": [26500],
   },
-  "components/resources/components_scaled_resources.grd": {
-    "structures": [29880],
+  "ui/resources/ui_resources.grd": {
+    "structures": [26600],
   },
-  "third_party/WebKit/public/blink_resources.grd": {
-    "includes": [30100],
-    "structures": [30400],
+  "ui/resources/ui_unscaled_resources.grd": {
+    "includes": [26850],
   },
-  "chrome/browser/resources/md_policy/policy_resources.grd": {
-    "structures": [30630],
+  "ui/strings/app_locale_settings.grd": {
+    "messages": [26900],
   },
-  "chrome/browser/resources/settings/settings_resources.grd": {
-    "structures": [30650],
+  "ui/strings/ui_strings.grd": {
+    "messages": [26950],
   },
-  "headless/lib/resources/headless_lib_resources.grd": {
-    "includes": [30670],
+  "ui/views/resources/views_resources.grd": {
+    "structures": [27150],
   },
-  "blimp/engine/app/blimp_browser_resources.grd": {
-    "includes": [30680],
+  "ui/webui/resources/webui_resources.grd": {
+    "includes": [27450],
+    "structures": [27650],
   },
-  "chromecast/browser/cast_browser_resources.grd": {
-    "includes": [30690],
+
+  # This file is generated during the build.
+  "<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd": {
+    "includes": [28450],
   },
-  "blimp/client/support/resources/blimp_strings.grd": {
-    "messages": [30700],
+  "devtools_resources.grd": {
+    "includes": [28450],
   },
+  # END "everything else" section.
+  # Everything but chrome/, components/, content/, and ios/
+
+  # Thinking about appending to the end?
+  # Please read the header and find the right section above instead.
 
   # Resource ids starting at 31000 are reserved for projects built on Chromium.
 }