OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/chrome_impl.h" | 5 #include "chrome/test/chromedriver/chrome/chrome_impl.h" |
6 | 6 |
7 #include "chrome/test/chromedriver/chrome/devtools_client.h" | 7 #include "chrome/test/chromedriver/chrome/devtools_client.h" |
8 #include "chrome/test/chromedriver/chrome/devtools_event_listener.h" | 8 #include "chrome/test/chromedriver/chrome/devtools_event_listener.h" |
9 #include "chrome/test/chromedriver/chrome/devtools_http_client.h" | 9 #include "chrome/test/chromedriver/chrome/devtools_http_client.h" |
10 #include "chrome/test/chromedriver/chrome/status.h" | 10 #include "chrome/test/chromedriver/chrome/status.h" |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 if (!found) { | 76 if (!found) { |
77 scoped_ptr<DevToolsClient> client( | 77 scoped_ptr<DevToolsClient> client( |
78 devtools_http_client_->CreateClient(view.id)); | 78 devtools_http_client_->CreateClient(view.id)); |
79 for (ScopedVector<DevToolsEventListener>::const_iterator listener = | 79 for (ScopedVector<DevToolsEventListener>::const_iterator listener = |
80 devtools_event_listeners_.begin(); | 80 devtools_event_listeners_.begin(); |
81 listener != devtools_event_listeners_.end(); ++listener) { | 81 listener != devtools_event_listeners_.end(); ++listener) { |
82 client->AddListener(*listener); | 82 client->AddListener(*listener); |
83 // OnConnected will fire when DevToolsClient connects later. | 83 // OnConnected will fire when DevToolsClient connects later. |
84 } | 84 } |
85 web_views_.push_back(make_linked_ptr(new WebViewImpl( | 85 web_views_.push_back(make_linked_ptr(new WebViewImpl( |
86 view.id, devtools_http_client_->browser_info(), client.Pass()))); | 86 view.id, |
| 87 devtools_http_client_->browser_info(), |
| 88 client.Pass(), |
| 89 devtools_http_client_->device_metrics_.get()))); |
87 } | 90 } |
88 } | 91 } |
89 | 92 |
90 std::list<std::string> web_view_ids_tmp; | 93 std::list<std::string> web_view_ids_tmp; |
91 for (WebViewList::const_iterator web_view_iter = web_views_.begin(); | 94 for (WebViewList::const_iterator web_view_iter = web_views_.begin(); |
92 web_view_iter != web_views_.end(); ++web_view_iter) { | 95 web_view_iter != web_views_.end(); ++web_view_iter) { |
93 web_view_ids_tmp.push_back((*web_view_iter)->GetId()); | 96 web_view_ids_tmp.push_back((*web_view_iter)->GetId()); |
94 } | 97 } |
95 web_view_ids->swap(web_view_ids_tmp); | 98 web_view_ids->swap(web_view_ids_tmp); |
96 return Status(kOk); | 99 return Status(kOk); |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 | 137 |
135 ChromeImpl::ChromeImpl( | 138 ChromeImpl::ChromeImpl( |
136 scoped_ptr<DevToolsHttpClient> client, | 139 scoped_ptr<DevToolsHttpClient> client, |
137 ScopedVector<DevToolsEventListener>& devtools_event_listeners, | 140 ScopedVector<DevToolsEventListener>& devtools_event_listeners, |
138 scoped_ptr<PortReservation> port_reservation) | 141 scoped_ptr<PortReservation> port_reservation) |
139 : quit_(false), | 142 : quit_(false), |
140 devtools_http_client_(client.Pass()), | 143 devtools_http_client_(client.Pass()), |
141 port_reservation_(port_reservation.Pass()) { | 144 port_reservation_(port_reservation.Pass()) { |
142 devtools_event_listeners_.swap(devtools_event_listeners); | 145 devtools_event_listeners_.swap(devtools_event_listeners); |
143 } | 146 } |
OLD | NEW |