diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-25 21:18:55 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-25 21:18:55 +0000 |
| commit | 58d72b5fa365f01894582bdcdb43ae02f057c96e (patch) | |
| tree | 458cffa719ea5276cab0685fa06a261f71a42329 /content/shell/browser/shell.h | |
| parent | f94adf183b7c54cf9fba498749328a6db6acb2c9 (diff) | |
| download | chromium_src-58d72b5fa365f01894582bdcdb43ae02f057c96e.zip chromium_src-58d72b5fa365f01894582bdcdb43ae02f057c96e.tar.gz chromium_src-58d72b5fa365f01894582bdcdb43ae02f057c96e.tar.bz2 | |
Revert of content-shell: Allow running content-shell headless with --dump-render-tree. (https://codereview.chromium.org/145253002/)
Reason for revert:
Crashes a lot on linux_rel during layout tests
Original issue's description:
> content-shell: Allow running content-shell headless with --dump-render-tree.
>
> Do some refactoring to allow using ShellAuraPlatformData in aura content_shell
> (with or without views). ShellAuraPlatformData is used for non-views aura
> content_shell (e.g. ozone) for all purposes, and in views content_shell only for
> headless mode.
>
> BUG=316712
> R=jam@chromium.org, sky@chromium.org
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=246921
TBR=dpranke@chromium.org,varkha@chromium.org,r.kasibhatla@samsung.com,jam@chromium.org,sky@chromium.org,sadrul@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=316712
Review URL: https://codereview.chromium.org/147773002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/browser/shell.h')
| -rw-r--r-- | content/shell/browser/shell.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h index 92cd7b5..edd59ce 100644 --- a/content/shell/browser/shell.h +++ b/content/shell/browser/shell.h @@ -41,7 +41,7 @@ class GURL; namespace content { #if defined(USE_AURA) -class ShellPlatformDataAura; +class ShellAuraPlatformData; #endif class BrowserContext; @@ -259,9 +259,10 @@ class Shell : public WebContentsDelegate, static views::ViewsDelegate* views_delegate_; views::Widget* window_widget_; +#else // defined(TOOLKIT_VIEWS) + static ShellAuraPlatformData* platform_; #endif // defined(TOOLKIT_VIEWS) - static ShellPlatformDataAura* platform_; -#endif // defined(USE_AURA) +#endif bool headless_; |