| Index: chrome/test/chromedriver/chrome/chrome_impl.cc
|
| ===================================================================
|
| --- chrome/test/chromedriver/chrome/chrome_impl.cc (revision 194993)
|
| +++ chrome/test/chromedriver/chrome/chrome_impl.cc (working copy)
|
| @@ -4,7 +4,9 @@
|
|
|
| #include "chrome/test/chromedriver/chrome/chrome_impl.h"
|
|
|
| +#include "base/logging.h"
|
| #include "chrome/test/chromedriver/chrome/devtools_client.h"
|
| +#include "chrome/test/chromedriver/chrome/devtools_event_logger.h"
|
| #include "chrome/test/chromedriver/chrome/devtools_http_client.h"
|
| #include "chrome/test/chromedriver/chrome/javascript_dialog_manager.h"
|
| #include "chrome/test/chromedriver/chrome/status.h"
|
| @@ -53,8 +55,16 @@
|
| }
|
| }
|
| if (!found) {
|
| + scoped_ptr<DevToolsClient> client(
|
| + devtools_http_client_->CreateClient(view.id));
|
| + for (std::list<DevToolsEventLogger*>::const_iterator logger =
|
| + devtools_event_loggers_.begin();
|
| + logger != devtools_event_loggers_.end(); ++logger) {
|
| + client->AddListener(*logger);
|
| + // Logger's OnConnected will fire when DevToolsClient connects later.
|
| + }
|
| web_views_.push_back(make_linked_ptr(new WebViewImpl(
|
| - view.id, devtools_http_client_->CreateClient(view.id))));
|
| + view.id, client.Pass())));
|
| }
|
| }
|
|
|
| @@ -131,10 +141,12 @@
|
| ChromeImpl::ChromeImpl(
|
| scoped_ptr<DevToolsHttpClient> client,
|
| const std::string& version,
|
| - int build_no)
|
| + int build_no,
|
| + const std::list<DevToolsEventLogger*>& devtools_event_loggers)
|
| : devtools_http_client_(client.Pass()),
|
| version_(version),
|
| - build_no_(build_no) {}
|
| + build_no_(build_no),
|
| + devtools_event_loggers_(devtools_event_loggers) {}
|
|
|
| Status ChromeImpl::GetDialogManagerForOpenDialog(
|
| JavaScriptDialogManager** manager) {
|
|
|