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

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: 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 60
64 // HeadlessDevToolsTarget implementation: 61 // HeadlessDevToolsTarget implementation:
65 bool AttachClient(HeadlessDevToolsClient* client) override; 62 bool AttachClient(HeadlessDevToolsClient* client) override;
66 void ForceAttachClient(HeadlessDevToolsClient* client) override; 63 void ForceAttachClient(HeadlessDevToolsClient* client) override;
67 void DetachClient(HeadlessDevToolsClient* client) override; 64 void DetachClient(HeadlessDevToolsClient* client) override;
68 bool IsAttached() override; 65 bool IsAttached() override;
69 66
70 // content::DevToolsAgentHostObserver implementation: 67 // content::DevToolsAgentHostObserver implementation:
71 void DevToolsAgentHostAttached( 68 void DevToolsAgentHostAttached(
72 content::DevToolsAgentHost* agent_host) override; 69 content::DevToolsAgentHost* agent_host) override;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 int GetMainFrameRenderProcessId() const; 106 int GetMainFrameRenderProcessId() const;
110 107
111 private: 108 private:
112 // Takes ownership of |web_contents|. 109 // Takes ownership of |web_contents|.
113 HeadlessWebContentsImpl(content::WebContents* web_contents, 110 HeadlessWebContentsImpl(content::WebContents* web_contents,
114 HeadlessBrowserContextImpl* browser_context); 111 HeadlessBrowserContextImpl* browser_context);
115 112
116 void InitializeScreen(const gfx::Size& initial_size); 113 void InitializeScreen(const gfx::Size& initial_size);
117 using MojoService = HeadlessWebContents::Builder::MojoService; 114 using MojoService = HeadlessWebContents::Builder::MojoService;
118 115
119 std::unordered_map<content::RenderFrameHost*, std::string>
120 render_frame_host_to_devtools_agent_host_id_;
121 std::unordered_map<std::string, int> devtools_agent_id_to_frame_tree_node_id_;
122
123 class Delegate; 116 class Delegate;
124 std::unique_ptr<Delegate> web_contents_delegate_; 117 std::unique_ptr<Delegate> web_contents_delegate_;
125 std::unique_ptr<HeadlessWindowTreeHost> window_tree_host_; 118 std::unique_ptr<HeadlessWindowTreeHost> window_tree_host_;
126 std::unique_ptr<content::WebContents> web_contents_; 119 std::unique_ptr<content::WebContents> web_contents_;
127 scoped_refptr<content::DevToolsAgentHost> agent_host_; 120 scoped_refptr<content::DevToolsAgentHost> agent_host_;
128 std::list<MojoService> mojo_services_; 121 std::list<MojoService> mojo_services_;
129 std::unique_ptr<HeadlessTabSocketImpl> headless_tab_socket_; 122 std::unique_ptr<HeadlessTabSocketImpl> headless_tab_socket_;
130 123
131 HeadlessBrowserContextImpl* browser_context_; // Not owned. 124 HeadlessBrowserContextImpl* browser_context_; // Not owned.
132 // TODO(alexclarke): With OOPIF there may be more than one renderer, we need 125 // TODO(alexclarke): With OOPIF there may be more than one renderer, we need
133 // to fix this. See crbug.com/715924 126 // to fix this. See crbug.com/715924
134 content::RenderProcessHost* render_process_host_; // Not owned. 127 content::RenderProcessHost* render_process_host_; // Not owned.
135 128
136 using ObserverMap = 129 using ObserverMap =
137 std::unordered_map<HeadlessWebContents::Observer*, 130 std::unordered_map<HeadlessWebContents::Observer*,
138 std::unique_ptr<WebContentsObserverAdapter>>; 131 std::unique_ptr<WebContentsObserverAdapter>>;
139 ObserverMap observer_map_; 132 ObserverMap observer_map_;
140 133
141 DISALLOW_COPY_AND_ASSIGN(HeadlessWebContentsImpl); 134 DISALLOW_COPY_AND_ASSIGN(HeadlessWebContentsImpl);
142 }; 135 };
143 136
144 } // namespace headless 137 } // namespace headless
145 138
146 #endif // HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_ 139 #endif // HEADLESS_LIB_BROWSER_HEADLESS_WEB_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698