diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-20 06:08:16 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-20 06:08:16 +0000 |
| commit | b63fffebc66986665da2192649b59d4b0f9a7f59 (patch) | |
| tree | 626eab07c68286ef974d3e3b0732684e9c43af1f /build/build_config.h | |
| parent | 62f37684af00493f01d2212c26db073ff20b60cb (diff) | |
| download | chromium_src-b63fffebc66986665da2192649b59d4b0f9a7f59.zip chromium_src-b63fffebc66986665da2192649b59d4b0f9a7f59.tar.gz chromium_src-b63fffebc66986665da2192649b59d4b0f9a7f59.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
Previously, on this issue:
* Landed in r229507
* Speculatively reverted in r229521.
* Relanded in r229524, since the revert didn't fix anything.
* Reverted in r229525 because it broken win-blink bots.
Review URL: https://codereview.chromium.org/26695007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229671 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__) |