summaryrefslogtreecommitdiffstats
path: root/ui/views
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-07 16:34:17 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-07 16:34:17 +0000
commitb35c9a4df8bf5409b34a7115fa6aec3e49588c34 (patch)
tree88be81b4c174aecc4e392e27773d4eb568291924 /ui/views
parent3b58601800eff42f1cf2bc9e3bdba0df18891057 (diff)
downloadchromium_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 'ui/views')
-rw-r--r--ui/views/views.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 527e9c2..4308183 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -47,8 +47,8 @@
'msvs_guid': '70760ECA-4D8B-47A4-ACDC-D3E7F25F0543',
'dependencies': [
'<(DEPTH)/app/app.gyp:app_base',
+ '<(DEPTH)/app/app.gyp:app_strings',
'<(DEPTH)/skia/skia.gyp:skia',
- '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx',
],
'sources': [