Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5219)

Unified Diff: chrome/test/chromedriver/chrome/chrome_impl.cc

Issue 14263024: Logging API in chromedriver2. (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/chromedriver/chrome/chrome_impl.cc
===================================================================
--- chrome/test/chromedriver/chrome/chrome_impl.cc (revision 194587)
+++ 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,19 @@
}
}
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) {
+ Status add_status((*logger)->AddDevToolsClient(client.get()));
kkania 2013/04/18 17:34:39 get rid of AddDevToolsClient, and just do client->
klm 2013/04/18 19:11:31 Done and noted that OnConnect gets called later --
+ if (!add_status.IsOk()) {
+ LOG(ERROR) << "Error adding DevTools client to event logger: code "
+ << add_status.code();
+ }
+ }
web_views_.push_back(make_linked_ptr(new WebViewImpl(
- view.id, devtools_http_client_->CreateClient(view.id))));
+ view.id, client.Pass())));
}
}
@@ -131,10 +144,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) {

Powered by Google App Engine
This is Rietveld 408576698