diff options
author | miu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 23:34:37 +0000 |
---|---|---|
committer | miu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 23:34:37 +0000 |
commit | ef7cb527912d5b37a73e0b43dcd49623bd2ab482 (patch) | |
tree | b5e51b590ddd53e32c63296d50053e1ffcd797a7 /tools/gritsettings | |
parent | 0ff08a372f26e388e35d4dc78c6760c6659bab15 (diff) | |
download | chromium_src-ef7cb527912d5b37a73e0b43dcd49623bd2ab482.zip chromium_src-ef7cb527912d5b37a73e0b43dcd49623bd2ab482.tar.gz chromium_src-ef7cb527912d5b37a73e0b43dcd49623bd2ab482.tar.bz2 |
Re-land r230914 (tab tooltip strings) with fix for generated_resources.grd issue, per joi@ and tony@.
It turns out adding strings to generated_resources.grd has caused us to reach our limit in the ID key space. Per e-mail thread on chromium-dev@, we decided to make an ID bump in tools/gritsettings/resource_ids, to the starting point for webkit_strings.grd, in order to make room for more strings in generated_resources.grd.
TBR=sky,tony
Review URL: https://codereview.chromium.org/46043002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gritsettings')
-rw-r--r-- | tools/gritsettings/resource_ids | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index f02e9ec..0af0ece 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids @@ -120,7 +120,7 @@ "messages": [17500], }, "webkit/glue/webkit_strings.grd": { - "messages": [18000], + "messages": [18500], }, "chrome_frame/resources/chrome_frame_resources.grd": { |