| Index: headless/lib/browser/headless_web_contents_impl.h
|
| diff --git a/headless/lib/browser/headless_web_contents_impl.h b/headless/lib/browser/headless_web_contents_impl.h
|
| index 9c335ee20636994f7300b62598548647d10bf32f..4aca28c81662feded60f1b98344a9170252c0e65 100644
|
| --- a/headless/lib/browser/headless_web_contents_impl.h
|
| +++ b/headless/lib/browser/headless_web_contents_impl.h
|
| @@ -5,13 +5,15 @@
|
| #ifndef HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_
|
| #define HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_
|
|
|
| +#include <list>
|
| +#include <memory>
|
| +#include <string>
|
| +#include <unordered_map>
|
| +
|
| #include "content/public/browser/web_contents_observer.h"
|
| #include "headless/public/headless_devtools_target.h"
|
| #include "headless/public/headless_web_contents.h"
|
|
|
| -#include <memory>
|
| -#include <unordered_map>
|
| -
|
| namespace aura {
|
| class Window;
|
| }
|
| @@ -41,13 +43,12 @@ class HeadlessWebContentsImpl : public HeadlessWebContents,
|
|
|
| static std::unique_ptr<HeadlessWebContentsImpl> Create(
|
| HeadlessWebContents::Builder* builder,
|
| - aura::Window* parent_window,
|
| - HeadlessBrowserImpl* browser);
|
| + aura::Window* parent_window);
|
|
|
| // Takes ownership of |web_contents|.
|
| static std::unique_ptr<HeadlessWebContentsImpl> CreateFromWebContents(
|
| content::WebContents* web_contents,
|
| - HeadlessBrowserImpl* browser);
|
| + HeadlessBrowserContextImpl* browser_context);
|
|
|
| // HeadlessWebContents implementation:
|
| void AddObserver(Observer* observer) override;
|
| @@ -68,10 +69,13 @@ class HeadlessWebContentsImpl : public HeadlessWebContents,
|
|
|
| std::string GetDevtoolsAgentHostId();
|
|
|
| + HeadlessBrowserImpl* browser() const;
|
| + HeadlessBrowserContextImpl* browser_context() const;
|
| +
|
| private:
|
| // Takes ownership of |web_contents|.
|
| HeadlessWebContentsImpl(content::WebContents* web_contents,
|
| - HeadlessBrowserImpl* browser);
|
| + HeadlessBrowserContextImpl* browser_context);
|
|
|
| void InitializeScreen(aura::Window* parent_window,
|
| const gfx::Size& initial_size);
|
| @@ -84,7 +88,7 @@ class HeadlessWebContentsImpl : public HeadlessWebContents,
|
| scoped_refptr<content::DevToolsAgentHost> agent_host_;
|
| std::list<MojoService> mojo_services_;
|
|
|
| - HeadlessBrowserImpl* browser_; // Not owned.
|
| + HeadlessBrowserContextImpl* browser_context_; // Not owned.
|
|
|
| using ObserverMap =
|
| std::unordered_map<HeadlessWebContents::Observer*,
|
|
|