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 /chrome | |
| 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 'chrome')
| -rw-r--r-- | chrome/app/locales/locales.gyp | 2 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/app/locales/locales.gyp b/chrome/app/locales/locales.gyp index 79ac5f8..1e5024a 100644 --- a/chrome/app/locales/locales.gyp +++ b/chrome/app/locales/locales.gyp @@ -25,8 +25,8 @@ 'dependencies': [ '../../chrome.gyp:chrome_strings', '../../chrome.gyp:platform_locale_settings', - '../../../ui/base/strings/ui_strings.gyp:ui_strings', '../../../webkit/support/webkit_support.gyp:webkit_strings', + '../../../app/app.gyp:app_strings', ], 'msvs_settings': { 'VCLinkerTool': { diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 39314b9..e535fd3 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -27,6 +27,7 @@ 'theme_resources', 'userfeedback_proto', '../app/app.gyp:app_resources', + '../app/app.gyp:app_strings', '../content/content.gyp:content_browser', '../media/media.gyp:media', '../ppapi/ppapi.gyp:ppapi_proxy', # For PpapiMsg_LoadPlugin @@ -40,7 +41,6 @@ '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libxml/libxml.gyp:libxml', '../third_party/npapi/npapi.gyp:npapi', - '../ui/base/strings/ui_strings.gyp:ui_strings', '../webkit/support/webkit_support.gyp:appcache', '../webkit/support/webkit_support.gyp:blob', '../webkit/support/webkit_support.gyp:database', |