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

Side by Side Diff: tools/gritsettings/resource_ids

Issue 2891793002: Adjust address_input_strings.grd string ids to avoid conflict with ios string ids. (Closed)
Patch Set: Addressed comments 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 # 4 #
5 # This file is used to assign starting resource ids for resources and strings 5 # This file is used to assign starting resource ids for resources and strings
6 # used by Chromium. This is done to ensure that resource ids are unique 6 # used by Chromium. This is done to ensure that resource ids are unique
7 # across all the grd files. If you are adding a new grd file, please add 7 # across all the grd files. If you are adding a new grd file, please add
8 # a new entry to this file. 8 # a new entry to this file.
9 # 9 #
10 # The entries below are organized into sections. When adding new entries, 10 # The entries below are organized into sections. When adding new entries,
(...skipping 12 matching lines...) Expand all
23 # The first entry in the file, SRCDIR, is special: It is a relative path from 23 # The first entry in the file, SRCDIR, is special: It is a relative path from
24 # this file to the base of your checkout. 24 # this file to the base of your checkout.
25 "SRCDIR": "../..", 25 "SRCDIR": "../..",
26 26
27 # START chrome/app section. 27 # START chrome/app section.
28 # Previous versions of this file started with resource id 400, so stick with 28 # Previous versions of this file started with resource id 400, so stick with
29 # that. 29 # that.
30 # 30 #
31 # chrome/ and ios/chrome/ must start at the same id. 31 # chrome/ and ios/chrome/ must start at the same id.
32 # App only use one file depending on whether it is iOS or other platform. 32 # App only use one file depending on whether it is iOS or other platform.
33 # TODO(crbug.com/672458): Move this out of src/chrome/.
33 "chrome/app/address_input_strings.grd": { 34 "chrome/app/address_input_strings.grd": {
Lei Zhang 2017/05/17 18:11:46 How about we move this down to the end of the file
Moe 2017/05/17 18:36:12 Done.
34 "messages": [400], 35 "messages": [400],
35 }, 36 },
36 37
37 # Chromium strings and Google Chrome strings must start at the same id. 38 # Chromium strings and Google Chrome strings must start at the same id.
38 # We only use one file depending on whether we're building Chromium or 39 # We only use one file depending on whether we're building Chromium or
39 # Google Chrome. 40 # Google Chrome.
40 "chrome/app/chromium_strings.grd": { 41 "chrome/app/chromium_strings.grd": {
41 "messages": [500], 42 "messages": [500],
42 }, 43 },
43 "chrome/app/google_chrome_strings.grd": { 44 "chrome/app/google_chrome_strings.grd": {
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 "<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd": { 200 "<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd": {
200 "includes": [20550], 201 "includes": [20550],
201 }, 202 },
202 # END content/ section. 203 # END content/ section.
203 204
204 # START ios/ section. 205 # START ios/ section.
205 # 206 #
206 # chrome/ and ios/chrome/ must start at the same id. 207 # chrome/ and ios/chrome/ must start at the same id.
207 # App only use one file depending on whether it is iOS or other platform. 208 # App only use one file depending on whether it is iOS or other platform.
208 "ios/chrome/app/resources/ios_resources.grd": { 209 "ios/chrome/app/resources/ios_resources.grd": {
209 "includes": [400], 210 "includes": [500],
210 "structures": [1000], 211 "structures": [1100],
211 }, 212 },
212 213
213 # Chromium strings and Google Chrome strings must start at the same id. 214 # Chromium strings and Google Chrome strings must start at the same id.
214 # We only use one file depending on whether we're building Chromium or 215 # We only use one file depending on whether we're building Chromium or
215 # Google Chrome. 216 # Google Chrome.
216 "ios/chrome/app/strings/ios_chromium_strings.grd": { 217 "ios/chrome/app/strings/ios_chromium_strings.grd": {
217 "messages": [1500], 218 "messages": [1600],
218 }, 219 },
219 "ios/chrome/app/strings/ios_google_chrome_strings.grd": { 220 "ios/chrome/app/strings/ios_google_chrome_strings.grd": {
220 "messages": [1500], 221 "messages": [1600],
221 }, 222 },
222 223
223 "ios/chrome/app/strings/ios_strings.grd": { 224 "ios/chrome/app/strings/ios_strings.grd": {
224 "messages": [2000], 225 "messages": [2100],
225 }, 226 },
226 "ios/chrome/app/theme/ios_theme_resources.grd": { 227 "ios/chrome/app/theme/ios_theme_resources.grd": {
227 "structures": [2500], 228 "structures": [2600],
228 }, 229 },
229 "ios/chrome/share_extension/strings/ios_share_extension_strings.grd": { 230 "ios/chrome/share_extension/strings/ios_share_extension_strings.grd": {
230 "messages": [3000], 231 "messages": [3100],
231 }, 232 },
232 "ios/chrome/today_extension/strings/ios_today_extension_strings.grd": { 233 "ios/chrome/today_extension/strings/ios_today_extension_strings.grd": {
233 "messages": [3010], 234 "messages": [3110],
234 }, 235 },
235 "ios/chrome/search_widget_extension/strings/ios_search_widget_extension_string s.grd": { 236 "ios/chrome/search_widget_extension/strings/ios_search_widget_extension_string s.grd": {
236 "messages": [3050], 237 "messages": [3150],
237 }, 238 },
238 239
239 # content/ and ios/web/ must start at the same id. 240 # content/ and ios/web/ must start at the same id.
240 # App only use one file depending on whether it is iOS or other platform. 241 # App only use one file depending on whether it is iOS or other platform.
241 "ios/web/ios_web_resources.grd": { 242 "ios/web/ios_web_resources.grd": {
242 "includes": [20000], 243 "includes": [20000],
243 }, 244 },
244 "ios/web/test/test_resources.grd": { 245 "ios/web/test/test_resources.grd": {
245 "includes": [22000], 246 "includes": [22000],
246 }, 247 },
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 "messages": [28650], 360 "messages": [28650],
360 }, 361 },
361 # END "everything else" section. 362 # END "everything else" section.
362 # Everything but chrome/, components/, content/, and ios/ 363 # Everything but chrome/, components/, content/, and ios/
363 364
364 # Thinking about appending to the end? 365 # Thinking about appending to the end?
365 # Please read the header and find the right section above instead. 366 # Please read the header and find the right section above instead.
366 367
367 # Resource ids starting at 31000 are reserved for projects built on Chromium. 368 # Resource ids starting at 31000 are reserved for projects built on Chromium.
368 } 369 }
OLDNEW
« 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