diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-19 06:47:47 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-19 06:47:47 +0000 |
| commit | ee5eef01050628bf12b0de9f1acaa20312e3b6ea (patch) | |
| tree | 3731365972e9308a369a08d444a95b82dcd2aef2 /content/shell/browser/shell.cc | |
| parent | 50568358d69f3227ba867bf1e3d111f0d0169c73 (diff) | |
| download | chromium_src-ee5eef01050628bf12b0de9f1acaa20312e3b6ea.zip chromium_src-ee5eef01050628bf12b0de9f1acaa20312e3b6ea.tar.gz chromium_src-ee5eef01050628bf12b0de9f1acaa20312e3b6ea.tar.bz2 | |
Revert 229521 "Revert 229507 "aura: Allow creating content_shell..."
Revert didn't help, so reland the change.
> 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
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/27993005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229524 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/browser/shell.cc')
| -rw-r--r-- | content/shell/browser/shell.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc index 55cf85a..8f64cdc 100644 --- a/content/shell/browser/shell.cc +++ b/content/shell/browser/shell.cc @@ -29,6 +29,10 @@ #include "content/shell/common/shell_messages.h" #include "content/shell/common/shell_switches.h" +#if defined(USE_AURA) && !defined(TOOLKIT_VIEWS) +#include "content/shell/browser/shell_aura.h" +#endif + namespace content { const int Shell::kDefaultTestWindowWidthDip = 800; |