Index: chrome/renderer/devtools_client.h |
=================================================================== |
--- chrome/renderer/devtools_client.h (revision 30177) |
+++ chrome/renderer/devtools_client.h (working copy) |
@@ -7,23 +7,27 @@ |
#include <string> |
+#include "base/basictypes.h" |
#include "base/scoped_ptr.h" |
-#include "webkit/glue/webdevtoolsclient_delegate.h" |
+#include "webkit/api/public/WebDevToolsFrontendClient.h" |
namespace IPC { |
class Message; |
} |
class MessageLoop; |
class RenderView; |
-class WebDevToolsClient; |
+namespace WebKit { |
+class WebDevToolsFrontend; |
+} |
+ |
// Developer tools UI end of communication channel between the render process of |
// the page being inspected and tools UI renderer process. All messages will |
// go through browser process. On the side of the inspected page there's |
// corresponding DevToolsAgent object. |
// TODO(yurys): now the client is almost empty later it will delegate calls to |
// code in glue |
-class DevToolsClient : public WebDevToolsClientDelegate { |
+class DevToolsClient : public WebKit::WebDevToolsFrontendClient { |
public: |
explicit DevToolsClient(RenderView* view); |
virtual ~DevToolsClient(); |
@@ -32,19 +36,19 @@ |
// handled. Called in render thread. |
bool OnMessageReceived(const IPC::Message& message); |
- // WebDevToolsClient::Delegate implementation |
- virtual void SendMessageToAgent(const WebKit::WebString& class_name, |
+ // WebDevToolsFrontendClient implementation |
+ virtual void sendMessageToAgent(const WebKit::WebString& class_name, |
const WebKit::WebString& method_name, |
const WebKit::WebString& param1, |
const WebKit::WebString& param2, |
const WebKit::WebString& param3); |
- virtual void SendDebuggerCommandToAgent(const WebKit::WebString& command); |
+ virtual void sendDebuggerCommandToAgent(const WebKit::WebString& command); |
- virtual void ActivateWindow(); |
- virtual void CloseWindow(); |
- virtual void DockWindow(); |
- virtual void UndockWindow(); |
- virtual void ToggleInspectElementMode(bool enabled); |
+ virtual void activateWindow(); |
+ virtual void closeWindow(); |
+ virtual void dockWindow(); |
+ virtual void undockWindow(); |
+ virtual void toggleInspectElementMode(bool enabled); |
private: |
void OnRpcMessage(const std::string& class_name, |
@@ -57,7 +61,7 @@ |
void Send(const IPC::Message& tools_agent_message); |
RenderView* render_view_; // host render view |
- scoped_ptr<WebDevToolsClient> web_tools_client_; |
+ scoped_ptr<WebKit::WebDevToolsFrontend> web_tools_frontend_; |
DISALLOW_COPY_AND_ASSIGN(DevToolsClient); |
}; |