diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-19 02:04:29 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-19 02:04:29 +0000 |
| commit | f31ee0fa18c3f9f3d75b28777672d4e250ff53ee (patch) | |
| tree | 1620810b68caa814ad3a96a32514ab4aa52fc62e /build/build_config.h | |
| parent | 24920baa1ee8bf81c73622332783992bd0677531 (diff) | |
| download | chromium_src-f31ee0fa18c3f9f3d75b28777672d4e250ff53ee.zip chromium_src-f31ee0fa18c3f9f3d75b28777672d4e250ff53ee.tar.gz chromium_src-f31ee0fa18c3f9f3d75b28777672d4e250ff53ee.tar.bz2 | |
aura: Allow creating content_shell without views.
This builds content_shell with use_aura=1 and toolkit_views=0.
BUG=none
R=derat@chromium.org, jamescook@chromium.org, jochen@chromium.org
Review URL: https://codereview.chromium.org/26695007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/build_config.h')
| -rw-r--r-- | build/build_config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/build_config.h b/build/build_config.h index 3ea3ddc..4856614 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) +#if !defined(TOOLKIT_VIEWS) && defined(USE_X11) && !defined(USE_AURA) #define TOOLKIT_GTK #endif #if defined(__GLIBC__) && !defined(__UCLIBC__) |