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

Unified Diff: chrome/renderer/devtools_agent.cc

Issue 287009: Move WebDevToolsAgent{Delegate} into the WebKit API.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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 | « chrome/renderer/devtools_agent.h ('k') | chrome/renderer/devtools_agent_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/devtools_agent.cc
===================================================================
--- chrome/renderer/devtools_agent.cc (revision 29289)
+++ chrome/renderer/devtools_agent.cc (working copy)
@@ -7,9 +7,12 @@
#include "chrome/common/devtools_messages.h"
#include "chrome/common/render_messages.h"
#include "chrome/renderer/render_view.h"
+#include "webkit/api/public/WebDevToolsAgent.h"
+#include "webkit/api/public/WebPoint.h"
#include "webkit/api/public/WebString.h"
-#include "webkit/glue/webdevtoolsagent.h"
+using WebKit::WebDevToolsAgent;
+using WebKit::WebPoint;
using WebKit::WebString;
// static
@@ -28,7 +31,7 @@
void DevToolsAgent::OnNavigate() {
WebDevToolsAgent* web_agent = GetWebAgent();
if (web_agent) {
- web_agent->OnNavigate();
+ web_agent->didNavigate();
}
}
@@ -47,11 +50,11 @@
return handled;
}
-void DevToolsAgent::SendMessageToClient(const WebKit::WebString& class_name,
- const WebKit::WebString& method_name,
- const WebKit::WebString& param1,
- const WebKit::WebString& param2,
- const WebKit::WebString& param3) {
+void DevToolsAgent::sendMessageToFrontend(const WebString& class_name,
+ const WebString& method_name,
+ const WebString& param1,
+ const WebString& param2,
+ const WebString& param3) {
IPC::Message* m = new ViewHostMsg_ForwardToDevToolsClient(
routing_id_,
DevToolsClientMsg_RpcMessage(
@@ -63,11 +66,11 @@
view_->Send(m);
}
-int DevToolsAgent::GetHostId() {
+int DevToolsAgent::hostIdentifier() {
return routing_id_;
}
-void DevToolsAgent::ForceRepaint() {
+void DevToolsAgent::forceRepaint() {
view_->GenerateFullRepaint();
}
@@ -84,14 +87,14 @@
void DevToolsAgent::OnAttach() {
WebDevToolsAgent* web_agent = GetWebAgent();
if (web_agent) {
- web_agent->Attach();
+ web_agent->attach();
}
}
void DevToolsAgent::OnDetach() {
WebDevToolsAgent* web_agent = GetWebAgent();
if (web_agent) {
- web_agent->Detach();
+ web_agent->detach();
}
}
@@ -102,7 +105,7 @@
const std::string& param3) {
WebDevToolsAgent* web_agent = GetWebAgent();
if (web_agent) {
- web_agent->DispatchMessageFromClient(
+ web_agent->dispatchMessageFromFrontend(
WebString::fromUTF8(class_name),
WebString::fromUTF8(method_name),
WebString::fromUTF8(param1),
@@ -114,15 +117,15 @@
void DevToolsAgent::OnInspectElement(int x, int y) {
WebDevToolsAgent* web_agent = GetWebAgent();
if (web_agent) {
- web_agent->Attach();
- web_agent->InspectElement(x, y);
+ web_agent->attach();
+ web_agent->inspectElementAt(WebPoint(x, y));
}
}
void DevToolsAgent::OnSetApuAgentEnabled(bool enabled) {
WebDevToolsAgent* web_agent = GetWebAgent();
if (web_agent) {
- web_agent->SetApuAgentEnabled(enabled);
+ web_agent->setApuAgentEnabled(enabled);
}
}
@@ -130,5 +133,5 @@
WebView* web_view = view_->webview();
if (!web_view)
return NULL;
- return web_view->GetWebDevToolsAgent();
+ return web_view->devToolsAgent();
}
« no previous file with comments | « chrome/renderer/devtools_agent.h ('k') | chrome/renderer/devtools_agent_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698