summaryrefslogtreecommitdiffstats
path: root/build/build_config.h
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-20 06:49:12 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-20 06:49:12 +0000
commitc01a3358ee69a603d993ffd47def1d70b4823508 (patch)
tree0010516a7f0f98db598e5bfea74345629b2f593c /build/build_config.h
parent0b99515150201b93515e01b3d3a0b6398f83378d (diff)
downloadchromium_src-c01a3358ee69a603d993ffd47def1d70b4823508.zip
chromium_src-c01a3358ee69a603d993ffd47def1d70b4823508.tar.gz
chromium_src-c01a3358ee69a603d993ffd47def1d70b4823508.tar.bz2
Revert r229671 "aura: Allow creating content_shell without views."
http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win%20Builder%20%28deps%29/builds/74852/steps/compile/logs/stdio git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229683 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/build_config.h')
-rw-r--r--build/build_config.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/build_config.h b/build/build_config.h
index 4856614..3ea3ddc 100644
--- a/build/build_config.h
+++ b/build/build_config.h
@@ -31,7 +31,7 @@
#elif defined(__linux__)
#define OS_LINUX 1
// Use TOOLKIT_GTK on linux if TOOLKIT_VIEWS isn't defined.
-#if !defined(TOOLKIT_VIEWS) && defined(USE_X11) && !defined(USE_AURA)
+#if !defined(TOOLKIT_VIEWS) && defined(USE_X11)
#define TOOLKIT_GTK
#endif
#if defined(__GLIBC__) && !defined(__UCLIBC__)