| 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 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 | 104 |
| 105 //////////////////////////////////////////////////////////////////////////////// | 105 //////////////////////////////////////////////////////////////////////////////// |
| 106 // WebViewImpl, WebView implementation: | 106 // WebViewImpl, WebView implementation: |
| 107 | 107 |
| 108 void WebViewImpl::LoadRequest(mojo::URLRequestPtr request) { | 108 void WebViewImpl::LoadRequest(mojo::URLRequestPtr request) { |
| 109 navigation_controller_.LoadURL(request.Pass()); | 109 navigation_controller_.LoadURL(request.Pass()); |
| 110 } | 110 } |
| 111 | 111 |
| 112 void WebViewImpl::GetViewTreeClient( | 112 void WebViewImpl::GetViewTreeClient( |
| 113 mojo::InterfaceRequest<mojo::ViewTreeClient> view_tree_client) { | 113 mojo::InterfaceRequest<mojo::ViewTreeClient> view_tree_client) { |
| 114 mus::ViewTreeConnection::Create(this, view_tree_client.Pass()); | 114 mus::ViewTreeConnection::Create( |
| 115 this, view_tree_client.Pass(), |
| 116 mus::ViewTreeConnection::CreateType::DONT_WAIT_FOR_EMBED); |
| 115 } | 117 } |
| 116 | 118 |
| 117 void WebViewImpl::Find(int32_t request_id, const mojo::String& search_text) { | 119 void WebViewImpl::Find(int32_t request_id, const mojo::String& search_text) { |
| 118 find_controller_.Find(request_id, search_text); | 120 find_controller_.Find(request_id, search_text); |
| 119 } | 121 } |
| 120 | 122 |
| 121 void WebViewImpl::StopFinding() { | 123 void WebViewImpl::StopFinding() { |
| 122 find_controller_.StopFinding(); | 124 find_controller_.StopFinding(); |
| 123 } | 125 } |
| 124 | 126 |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 all_frames.push_back(current); | 286 all_frames.push_back(current); |
| 285 } | 287 } |
| 286 return all_frames; | 288 return all_frames; |
| 287 } | 289 } |
| 288 | 290 |
| 289 mojom::WebViewClient* WebViewImpl::GetWebViewClient() { | 291 mojom::WebViewClient* WebViewImpl::GetWebViewClient() { |
| 290 return client_.get(); | 292 return client_.get(); |
| 291 } | 293 } |
| 292 | 294 |
| 293 } // namespace web_view | 295 } // namespace web_view |
| OLD | NEW |