summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 21:27:21 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 21:27:21 +0000
commit8cfb591192035c18087296d931880149b2bf63a6 (patch)
treea8c8f922b35ebfd8e32aa5fd83fd5a802a13aea7 /tools
parent6c37af55bd6636da96748d4ebc51ad6a691d6435 (diff)
downloadchromium_src-8cfb591192035c18087296d931880149b2bf63a6.zip
chromium_src-8cfb591192035c18087296d931880149b2bf63a6.tar.gz
chromium_src-8cfb591192035c18087296d931880149b2bf63a6.tar.bz2
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. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/grit/resource_ids4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/grit/resource_ids b/tools/grit/resource_ids
index 97e9ee7..6817316 100644
--- a/tools/grit/resource_ids
+++ b/tools/grit/resource_ids
@@ -59,7 +59,7 @@
"includes": [7000],
},
- "app/resources/app_locale_settings.grd": {
+ "ui/base/strings/app_locale_settings.grd": {
"messages": [7500],
},
"chrome/app/resources/locale_settings.grd": {
@@ -81,7 +81,7 @@
"messages": [9000],
},
- "app/resources/app_strings.grd": {
+ "ui/base/strings/app_strings.grd": {
"messages": [9500],
},
# Chromium strings and Google Chrome strings must start at the same id.