DevTools: Remove base/ dependencies from glue/devtools

BUG=24622,24597

Review URL: http://codereview.chromium.org/330029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30330 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 16 insertions, 12 deletions

diff --git a/chrome/renderer/devtools_client.h b/chrome/renderer/devtools_client.h
index 45e926c..69b6ea6 100644
--- a/chrome/renderer/devtools_client.h
+++ b/chrome/renderer/devtools_client.h
@@ -7,15 +7,19 @@
 
 #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
@@ -23,7 +27,7 @@ class WebDevToolsClient;
 // 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 @@ class DevToolsClient : public WebDevToolsClientDelegate {
   // 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 @@ class DevToolsClient : public WebDevToolsClientDelegate {
   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);
 };