Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: tools/gritsettings/resource_ids

Issue 2891793002: Adjust address_input_strings.grd string ids to avoid conflict with ios string ids. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gritsettings/resource_ids
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index 5221b60daec2d4094b40a4ac6b2547bc47eeaea6..8541ac6bf5491a214ebb056f7c50575eb0b11439 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -30,6 +30,7 @@
#
# chrome/ and ios/chrome/ must start at the same id.
# App only use one file depending on whether it is iOS or other platform.
+ # TODO(crbug.com/672458): Move this out of src/chrome/.
"chrome/app/address_input_strings.grd": {
"messages": [400],
},
@@ -206,43 +207,43 @@
# chrome/ and ios/chrome/ 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": [400],
- "structures": [1000],
+ "includes": [500],
+ "structures": [1100],
},
# 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": [1500],
+ "messages": [1600],
},
"ios/chrome/app/strings/ios_google_chrome_strings.grd": {
- "messages": [1500],
+ "messages": [1600],
},
"ios/chrome/app/strings/ios_strings.grd": {
- "messages": [2000],
+ "messages": [2100],
},
"ios/chrome/app/theme/ios_theme_resources.grd": {
- "structures": [2500],
+ "structures": [2600],
},
"ios/chrome/share_extension/strings/ios_share_extension_strings.grd": {
- "messages": [3000],
+ "messages": [3100],
},
"ios/chrome/today_extension/strings/ios_today_extension_strings.grd": {
- "messages": [3010],
+ "messages": [3110],
},
"ios/chrome/search_widget_extension/strings/ios_search_widget_extension_strings.grd": {
- "messages": [3050],
+ "messages": [3150],
},
# content/ and ios/web/ 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": [20000],
+ "includes": [20100],
sdefresne 2017/05/17 15:53:31 Please leave this one untouched (it should start a
Moe 2017/05/17 16:01:45 Done.
},
"ios/web/test/test_resources.grd": {
- "includes": [22000],
+ "includes": [22100],
sdefresne 2017/05/17 15:53:31 ditto.
Moe 2017/05/17 16:01:45 Done.
},
# END ios/ section.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698