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

Unified Diff: webkit/tools/test_shell/test_shell_devtools_agent.cc

Issue 2871023: Revert 50726 "DevTools: Migrate to new WebView initialization (pass devtools client directly)." (Closed) Base URL: git://codf21.jail.google.com/chromium.git
Patch Set: Created 10 years, 6 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
« no previous file with comments | « webkit/tools/test_shell/test_shell_devtools_agent.h ('k') | webkit/tools/test_shell/test_shell_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_shell_devtools_agent.cc
diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.cc b/webkit/tools/test_shell/test_shell_devtools_agent.cc
old mode 100755
new mode 100644
index 20e8c16bf118f301124777065cc9b6898ae0bec6..704827db372ca6f460bf308ccdde1ab976567966
--- a/webkit/tools/test_shell/test_shell_devtools_agent.cc
+++ b/webkit/tools/test_shell/test_shell_devtools_agent.cc
@@ -57,18 +57,17 @@ void TestShellDevToolsAgent::DispatchMessageLoop() {
#pragma warning(disable : 4355)
#endif // defined(OS_WIN)
-TestShellDevToolsAgent::TestShellDevToolsAgent()
+TestShellDevToolsAgent::TestShellDevToolsAgent(WebView* web_view)
: call_method_factory_(this),
- dev_tools_client_(NULL) {
+ dev_tools_client_(NULL),
+ web_view_(web_view) {
static int dev_tools_agent_counter;
routing_id_ = ++dev_tools_agent_counter;
if (routing_id_ == 1)
WebDevToolsAgent::setMessageLoopDispatchHandler(
&TestShellDevToolsAgent::DispatchMessageLoop);
-}
-
-void TestShellDevToolsAgent::SetWebView(WebKit::WebView* web_view) {
- web_view_ = web_view;
+ web_dev_tools_agent_ = WebDevToolsAgent::create(web_view_, this);
+ web_view_->setDevToolsAgent(web_dev_tools_agent_);
}
void TestShellDevToolsAgent::sendMessageToFrontend(
« no previous file with comments | « webkit/tools/test_shell/test_shell_devtools_agent.h ('k') | webkit/tools/test_shell/test_shell_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698