diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-19 05:27:55 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-19 05:27:55 +0000 |
| commit | ecc87c893aa197f737b1d365d32093b51c2f0873 (patch) | |
| tree | 35dee950bdc8f7e8bbdb073e535c1dd248bf3d18 /build/build_config.h | |
| parent | fe1e2e97f78bb34ad3e29ec26fbb5f6f7ed52a90 (diff) | |
| download | chromium_src-ecc87c893aa197f737b1d365d32093b51c2f0873.zip chromium_src-ecc87c893aa197f737b1d365d32093b51c2f0873.tar.gz chromium_src-ecc87c893aa197f737b1d365d32093b51c2f0873.tar.bz2 | |
Revert 229507 "aura: Allow creating content_shell without views."
Speculative. All windows bots on the main waterfall except for the clobber
builder started timing out during compile during a window that had only this
change and two test-only changes in the range.
> 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
TBR=sadrul@chromium.org
Review URL: https://codereview.chromium.org/30413002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229521 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 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__) |