OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "chrome/test/chromedriver/chrome/devtools_http_client.h" | 5 #include "chrome/test/chromedriver/chrome/devtools_http_client.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 status = CloseWebView(*it); | 198 status = CloseWebView(*it); |
199 if (status.IsError()) | 199 if (status.IsError()) |
200 return status; | 200 return status; |
201 } | 201 } |
202 | 202 |
203 for (std::list<std::string>::const_iterator it = docked_frontend_ids.begin(); | 203 for (std::list<std::string>::const_iterator it = docked_frontend_ids.begin(); |
204 it != docked_frontend_ids.end(); ++it) { | 204 it != docked_frontend_ids.end(); ++it) { |
205 std::unique_ptr<DevToolsClient> client(new DevToolsClientImpl( | 205 std::unique_ptr<DevToolsClient> client(new DevToolsClientImpl( |
206 socket_factory_, web_socket_url_prefix_ + *it, *it)); | 206 socket_factory_, web_socket_url_prefix_ + *it, *it)); |
207 std::unique_ptr<WebViewImpl> web_view( | 207 std::unique_ptr<WebViewImpl> web_view( |
208 new WebViewImpl(*it, &browser_info_, std::move(client), NULL, | 208 new WebViewImpl(*it, false, &browser_info_, std::move(client), NULL, |
209 page_load_strategy_)); | 209 page_load_strategy_)); |
210 | 210 |
211 status = web_view->ConnectIfNecessary(); | 211 status = web_view->ConnectIfNecessary(); |
212 // Ignore disconnected error, because the debugger might have closed when | 212 // Ignore disconnected error, because the debugger might have closed when |
213 // its container page was closed above. | 213 // its container page was closed above. |
214 if (status.IsError() && status.code() != kDisconnected) | 214 if (status.IsError() && status.code() != kDisconnected) |
215 return status; | 215 return status; |
216 | 216 |
217 std::unique_ptr<base::Value> result; | 217 std::unique_ptr<base::Value> result; |
218 status = CloseWebView(*it); | 218 status = CloseWebView(*it); |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
306 Status status = ParseType(type_as_string, &type); | 306 Status status = ParseType(type_as_string, &type); |
307 if (status.IsError()) | 307 if (status.IsError()) |
308 return status; | 308 return status; |
309 temp_views_info.push_back(WebViewInfo(id, debugger_url, url, type)); | 309 temp_views_info.push_back(WebViewInfo(id, debugger_url, url, type)); |
310 } | 310 } |
311 *views_info = WebViewsInfo(temp_views_info); | 311 *views_info = WebViewsInfo(temp_views_info); |
312 return Status(kOk); | 312 return Status(kOk); |
313 } | 313 } |
314 | 314 |
315 } // namespace internal | 315 } // namespace internal |
OLD | NEW |