[headless] AddWindowTreeClient

headless/lib/browser/headless_web_contents_impl.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_
 #define HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_
 
 #include "headless/public/headless_web_contents.h"
 
 #include <memory>
 #include <unordered_map>
 
 namespace aura {
 class Window;
 }
 
 namespace content {
 class WebContents;
 class BrowserContext;
 }
 
 namespace gfx {
 class Size;
 }
 
 namespace headless {
+class HeadlessBrowserImpl;
 class WebContentsObserverAdapter;
 
 class HeadlessWebContentsImpl : public HeadlessWebContents {
  public:
-  HeadlessWebContentsImpl(content::BrowserContext* context,
-                          aura::Window* parent_window,
-                          const gfx::Size& initial_size);
   ~HeadlessWebContentsImpl() override;
 
+  static std::unique_ptr<HeadlessWebContentsImpl> Create(
+      content::BrowserContext* context,
+      aura::Window* parent_window,
+      const gfx::Size& initial_size,
+      HeadlessBrowserImpl* browser);
+
+  // Takes ownership of |web_contents|.
+  static std::unique_ptr<HeadlessWebContentsImpl> FromWebContents(

[Sami, 2016/04/20 16:38:50]

Maybe call this CreateFromWebContents() since this is a constructor too.

[altimin, 2016/04/20 17:35:25]

Done.

+      content::WebContents* web_contents,
+      HeadlessBrowserImpl* browser);
+
   // HeadlessWebContents implementation:
   void AddObserver(Observer* observer) override;
   void RemoveObserver(Observer* observer) override;
 
   content::WebContents* web_contents() const;
   bool OpenURL(const GURL& url);
 
+  bool IsDirectlyCreated() const override;
+
+  void Close() override;
+
  private:
+  // Takes ownership of |web_contents|.
+  HeadlessWebContentsImpl(content::WebContents* web_contents,
+                          HeadlessBrowserImpl* browser);
+
+  void InitializeScreen(aura::Window* parent_window,
+                        const gfx::Size& initial_size);
+
   class Delegate;
   std::unique_ptr<Delegate> web_contents_delegate_;
   std::unique_ptr<content::WebContents> web_contents_;
+  bool is_directly_created_;
+
+  HeadlessBrowserImpl* browser_;

[Sami, 2016/04/20 16:38:50]

// Not owned.

[altimin, 2016/04/20 17:35:25]

Done.

 
   using ObserverMap =
       std::unordered_map<HeadlessWebContents::Observer*,
                          std::unique_ptr<WebContentsObserverAdapter>>;
   ObserverMap observer_map_;
 
   DISALLOW_COPY_AND_ASSIGN(HeadlessWebContentsImpl);
 };
 
 }  // namespace headless
 
 #endif  // HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_