Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

Side by Side Diff: headless/lib/browser/headless_web_contents_impl.h

Issue 2863953003: Headless: Remove obsolete Mojo code and some other obsolete APIs (Closed)
Patch Set: Rebased Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_ 5 #ifndef HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_
6 #define HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_ 6 #define HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_
7 7
8 #include <list> 8 #include <list>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 // Takes ownership of |web_contents|. 50 // Takes ownership of |web_contents|.
51 static std::unique_ptr<HeadlessWebContentsImpl> CreateFromWebContents( 51 static std::unique_ptr<HeadlessWebContentsImpl> CreateFromWebContents(
52 content::WebContents* web_contents, 52 content::WebContents* web_contents,
53 HeadlessBrowserContextImpl* browser_context); 53 HeadlessBrowserContextImpl* browser_context);
54 54
55 // HeadlessWebContents implementation: 55 // HeadlessWebContents implementation:
56 void AddObserver(Observer* observer) override; 56 void AddObserver(Observer* observer) override;
57 void RemoveObserver(Observer* observer) override; 57 void RemoveObserver(Observer* observer) override;
58 HeadlessDevToolsTarget* GetDevToolsTarget() override; 58 HeadlessDevToolsTarget* GetDevToolsTarget() override;
59 HeadlessTabSocket* GetHeadlessTabSocket() const override; 59 HeadlessTabSocket* GetHeadlessTabSocket() const override;
60 bool GetFrameTreeNodeIdForDevToolsAgentHostId(
61 const std::string& devtools_agent_host_id,
62 int* frame_tree_node_id) const override;
63 std::string GetUntrustedDevToolsFrameIdForFrameTreeNodeId( 60 std::string GetUntrustedDevToolsFrameIdForFrameTreeNodeId(
64 int process_id, 61 int process_id,
65 int frame_tree_node_id) const override; 62 int frame_tree_node_id) const override;
66 int GetMainFrameRenderProcessId() const override; 63 int GetMainFrameRenderProcessId() const override;
67 64
68 // HeadlessDevToolsTarget implementation: 65 // HeadlessDevToolsTarget implementation:
69 bool AttachClient(HeadlessDevToolsClient* client) override; 66 bool AttachClient(HeadlessDevToolsClient* client) override;
70 void ForceAttachClient(HeadlessDevToolsClient* client) override; 67 void ForceAttachClient(HeadlessDevToolsClient* client) override;
71 void DetachClient(HeadlessDevToolsClient* client) override; 68 void DetachClient(HeadlessDevToolsClient* client) override;
72 bool IsAttached() override; 69 bool IsAttached() override;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 } 102 }
106 103
107 private: 104 private:
108 // Takes ownership of |web_contents|. 105 // Takes ownership of |web_contents|.
109 HeadlessWebContentsImpl(content::WebContents* web_contents, 106 HeadlessWebContentsImpl(content::WebContents* web_contents,
110 HeadlessBrowserContextImpl* browser_context); 107 HeadlessBrowserContextImpl* browser_context);
111 108
112 void InitializeScreen(const gfx::Size& initial_size); 109 void InitializeScreen(const gfx::Size& initial_size);
113 using MojoService = HeadlessWebContents::Builder::MojoService; 110 using MojoService = HeadlessWebContents::Builder::MojoService;
114 111
115 std::unordered_map<content::RenderFrameHost*, std::string>
116 render_frame_host_to_devtools_agent_host_id_;
117 std::unordered_map<std::string, int> devtools_agent_id_to_frame_tree_node_id_;
118
119 class Delegate; 112 class Delegate;
120 std::unique_ptr<Delegate> web_contents_delegate_; 113 std::unique_ptr<Delegate> web_contents_delegate_;
121 std::unique_ptr<HeadlessWindowTreeHost> window_tree_host_; 114 std::unique_ptr<HeadlessWindowTreeHost> window_tree_host_;
122 std::unique_ptr<content::WebContents> web_contents_; 115 std::unique_ptr<content::WebContents> web_contents_;
123 scoped_refptr<content::DevToolsAgentHost> agent_host_; 116 scoped_refptr<content::DevToolsAgentHost> agent_host_;
124 std::list<MojoService> mojo_services_; 117 std::list<MojoService> mojo_services_;
125 std::unique_ptr<HeadlessTabSocketImpl> headless_tab_socket_; 118 std::unique_ptr<HeadlessTabSocketImpl> headless_tab_socket_;
126 119
127 HeadlessBrowserContextImpl* browser_context_; // Not owned. 120 HeadlessBrowserContextImpl* browser_context_; // Not owned.
128 // TODO(alexclarke): With OOPIF there may be more than one renderer, we need 121 // TODO(alexclarke): With OOPIF there may be more than one renderer, we need
129 // to fix this. See crbug.com/715924 122 // to fix this. See crbug.com/715924
130 content::RenderProcessHost* render_process_host_; // Not owned. 123 content::RenderProcessHost* render_process_host_; // Not owned.
131 124
132 using ObserverMap = 125 using ObserverMap =
133 std::unordered_map<HeadlessWebContents::Observer*, 126 std::unordered_map<HeadlessWebContents::Observer*,
134 std::unique_ptr<WebContentsObserverAdapter>>; 127 std::unique_ptr<WebContentsObserverAdapter>>;
135 ObserverMap observer_map_; 128 ObserverMap observer_map_;
136 129
137 DISALLOW_COPY_AND_ASSIGN(HeadlessWebContentsImpl); 130 DISALLOW_COPY_AND_ASSIGN(HeadlessWebContentsImpl);
138 }; 131 };
139 132
140 } // namespace headless 133 } // namespace headless
141 134
142 #endif // HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_ 135 #endif // HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « headless/lib/browser/headless_browser_context_impl.cc ('k') | headless/lib/browser/headless_web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698