Commit d3e80539 authored by Johannes Henkel's avatar Johannes Henkel Committed by Commit Bot

[DevTools] Move field initialization into header for HeadlessShell.

This makes it a little easier to read / removes an ifdef.

Change-Id: If1d6505bf4820508e4bdd212be54bb3cb110a786
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1593733
Commit-Queue: Johannes Henkel <johannes@chromium.org>
Reviewed-by: default avatarAndrey Kosyakov <caseq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664824}
parent e4997e81
...@@ -172,15 +172,7 @@ int RunContentMain( ...@@ -172,15 +172,7 @@ int RunContentMain(
} // namespace } // namespace
HeadlessShell::HeadlessShell() HeadlessShell::HeadlessShell() : weak_factory_(this) {}
: browser_(nullptr),
#if !defined(CHROME_MULTIPLE_DLL_CHILD)
web_contents_(nullptr),
browser_context_(nullptr),
#endif
processed_page_ready_(false),
weak_factory_(this) {
}
HeadlessShell::~HeadlessShell() = default; HeadlessShell::~HeadlessShell() = default;
......
...@@ -97,13 +97,13 @@ class HeadlessShell : public HeadlessWebContents::Observer, ...@@ -97,13 +97,13 @@ class HeadlessShell : public HeadlessWebContents::Observer,
bool RemoteDebuggingEnabled() const; bool RemoteDebuggingEnabled() const;
GURL url_; GURL url_;
HeadlessBrowser* browser_; // Not owned. HeadlessBrowser* browser_ = nullptr; // Not owned.
std::unique_ptr<HeadlessDevToolsClient> devtools_client_; std::unique_ptr<HeadlessDevToolsClient> devtools_client_;
#if !defined(CHROME_MULTIPLE_DLL_CHILD) #if !defined(CHROME_MULTIPLE_DLL_CHILD)
HeadlessWebContents* web_contents_; HeadlessWebContents* web_contents_ = nullptr;
HeadlessBrowserContext* browser_context_; HeadlessBrowserContext* browser_context_ = nullptr;
#endif #endif
bool processed_page_ready_; bool processed_page_ready_ = false;
scoped_refptr<base::SequencedTaskRunner> file_task_runner_; scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
std::unique_ptr<base::FileProxy> file_proxy_; std::unique_ptr<base::FileProxy> file_proxy_;
base::WeakPtrFactory<HeadlessShell> weak_factory_; base::WeakPtrFactory<HeadlessShell> weak_factory_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment