OLD | NEW |
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 #include "components/web_view/web_view_impl.h" | 5 #include "components/web_view/web_view_impl.h" |
6 | 6 |
7 #include <queue> | 7 #include <queue> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 | 73 |
74 scoped_ptr<PendingWebViewLoad> pending_load(std::move(pending_load_)); | 74 scoped_ptr<PendingWebViewLoad> pending_load(std::move(pending_load_)); |
75 scoped_ptr<FrameConnection> frame_connection( | 75 scoped_ptr<FrameConnection> frame_connection( |
76 pending_load->frame_connection()); | 76 pending_load->frame_connection()); |
77 mus::mojom::WindowTreeClientPtr window_tree_client = | 77 mus::mojom::WindowTreeClientPtr window_tree_client = |
78 frame_connection->GetWindowTreeClient(); | 78 frame_connection->GetWindowTreeClient(); |
79 | 79 |
80 Frame::ClientPropertyMap client_properties; | 80 Frame::ClientPropertyMap client_properties; |
81 if (devtools_agent_) { | 81 if (devtools_agent_) { |
82 devtools_service::DevToolsAgentPtr forward_agent; | 82 devtools_service::DevToolsAgentPtr forward_agent; |
83 frame_connection->connection()->ConnectToService(&forward_agent); | 83 frame_connection->connection()->GetInterface(&forward_agent); |
84 devtools_agent_->AttachFrame(std::move(forward_agent), &client_properties); | 84 devtools_agent_->AttachFrame(std::move(forward_agent), &client_properties); |
85 } | 85 } |
86 | 86 |
87 mojom::FrameClient* frame_client = frame_connection->frame_client(); | 87 mojom::FrameClient* frame_client = frame_connection->frame_client(); |
88 const uint32_t content_handler_id = frame_connection->GetContentHandlerID(); | 88 const uint32_t content_handler_id = frame_connection->GetContentHandlerID(); |
89 frame_tree_.reset( | 89 frame_tree_.reset( |
90 new FrameTree(content_handler_id, content_, std::move(window_tree_client), | 90 new FrameTree(content_handler_id, content_, std::move(window_tree_client), |
91 this, frame_client, std::move(frame_connection), | 91 this, frame_client, std::move(frame_connection), |
92 client_properties, pending_load->navigation_start_time())); | 92 client_properties, pending_load->navigation_start_time())); |
93 } | 93 } |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
268 std::vector<Frame*> all_frames; | 268 std::vector<Frame*> all_frames; |
269 PreOrderDepthFirstTraverseTree(frame_tree_->root(), &all_frames); | 269 PreOrderDepthFirstTraverseTree(frame_tree_->root(), &all_frames); |
270 return all_frames; | 270 return all_frames; |
271 } | 271 } |
272 | 272 |
273 mojom::WebViewClient* WebViewImpl::GetWebViewClient() { | 273 mojom::WebViewClient* WebViewImpl::GetWebViewClient() { |
274 return client_.get(); | 274 return client_.get(); |
275 } | 275 } |
276 | 276 |
277 } // namespace web_view | 277 } // namespace web_view |
OLD | NEW |