summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-28 03:23:01 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-28 03:23:01 +0000
commitf83c6f7f3c90cd3bebaa961737ba80db27240c1f (patch)
treea3f88a052afb0c729bc087cd0a7fcb539a53df7c /content
parent33755436093b6bb4de670227245f31043c28f85e (diff)
downloadchromium_src-f83c6f7f3c90cd3bebaa961737ba80db27240c1f.zip
chromium_src-f83c6f7f3c90cd3bebaa961737ba80db27240c1f.tar.gz
chromium_src-f83c6f7f3c90cd3bebaa961737ba80db27240c1f.tar.bz2
Fold views_compositor=1 into use_aura=1
We don't have a use case for views_compositor=1 and use_aura=0 (and it's broken/untested anyway), so this simplifies things a little bit. BUG=None TEST=compiles, tests pass. Review URL: http://codereview.chromium.org/9225038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/content_tests.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 9f3d2e7..f75d1a4 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -141,7 +141,7 @@
'../build/linux/system.gyp:glib',
],
}],
- ['views_compositor==1', {
+ ['use_aura==1', {
'dependencies': [
'../ui/gfx/compositor/compositor.gyp:compositor',
],