diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-07 16:34:17 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-07 16:34:17 +0000 |
| commit | b35c9a4df8bf5409b34a7115fa6aec3e49588c34 (patch) | |
| tree | 88be81b4c174aecc4e392e27773d4eb568291924 /tools/grit | |
| parent | 3b58601800eff42f1cf2bc9e3bdba0df18891057 (diff) | |
| download | chromium_src-b35c9a4df8bf5409b34a7115fa6aec3e49588c34.zip chromium_src-b35c9a4df8bf5409b34a7115fa6aec3e49588c34.tar.gz chromium_src-b35c9a4df8bf5409b34a7115fa6aec3e49588c34.tar.bz2 | |
Revert 77068 - Carnitas: Move app_strings to ui/base/strings
To fix circular dependencies between ui/base/ui_base.gyp and app/app.gyp I'm moving app_strings to ui/base/strings.
BUG=72317
TEST=Compiled on Mac, Linux, Windows.
Review URL: http://codereview.chromium.org/6541035
TBR=sail@chromium.org
Review URL: http://codereview.chromium.org/6623055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/grit')
| -rw-r--r-- | tools/grit/resource_ids | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/grit/resource_ids b/tools/grit/resource_ids index 6817316..97e9ee7 100644 --- a/tools/grit/resource_ids +++ b/tools/grit/resource_ids @@ -59,7 +59,7 @@ "includes": [7000], }, - "ui/base/strings/app_locale_settings.grd": { + "app/resources/app_locale_settings.grd": { "messages": [7500], }, "chrome/app/resources/locale_settings.grd": { @@ -81,7 +81,7 @@ "messages": [9000], }, - "ui/base/strings/app_strings.grd": { + "app/resources/app_strings.grd": { "messages": [9500], }, # Chromium strings and Google Chrome strings must start at the same id. |