Move WebDevToolsAgent{Delegate} into the WebKit API.

Moves corresponding WebView and WebViewDelegate methods too.

This uses the term "Frontend" for what was previously known as "Client" in the
devtools interfaces.  This is to avoid awkward "ClientClient" naming.  Frontend
was Pavel Feldman's suggested renaming.  In a follow up patch, I will be
renaming WebDevToolsClient{Delegate} to WebDevToolsFrontend{Client}.

R=dglazkov
BUG=24597
TEST=none

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

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

1 files changed, 10 insertions, 15 deletions

diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index 91021f2..5c9b322 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -80,7 +80,6 @@ MSVC_POP_WARNING();
 #include "webkit/glue/webdevtoolsagent_impl.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpopupmenu_impl.h"
-#include "webkit/glue/webdevtoolsagent.h"
 #include "webkit/glue/webdevtoolsclient.h"
 #include "webkit/glue/webview_delegate.h"
 #include "webkit/glue/webview_impl.h"
@@ -99,6 +98,8 @@ using WebKit::WebCanvas;
 using WebKit::WebCompositionCommand;
 using WebKit::WebCompositionCommandConfirm;
 using WebKit::WebCompositionCommandDiscard;
+using WebKit::WebDevToolsAgent;
+using WebKit::WebDevToolsAgentClient;
 using WebKit::WebDragData;
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationCopy;
@@ -354,11 +355,10 @@ void WebViewImpl::initializeMainFrame(WebFrameClient* frame_client) {
 
   main_frame->InitMainFrame(this);
 
-  if (delegate_) {
-    WebDevToolsAgentDelegate* tools_delegate =
-        delegate_->GetWebDevToolsAgentDelegate();
-    if (tools_delegate)
-      devtools_agent_.reset(new WebDevToolsAgentImpl(this, tools_delegate));
+  if (client()) {
+    WebDevToolsAgentClient* tools_client = client()->devToolsAgentClient();
+    if (tools_client)
+      devtools_agent_.reset(new WebDevToolsAgentImpl(this, tools_client));
   }
 
   // Restrict the access to the local file system
@@ -1665,6 +1665,10 @@ void WebViewImpl::setInspectorSettings(const WebString& settings) {
   inspector_settings_ = settings;
 }
 
+WebDevToolsAgent* WebViewImpl::devToolsAgent() {
+  return devtools_agent_.get();
+}
+
 WebAccessibilityObject WebViewImpl::accessibilityObject() {
   if (!main_frame())
     return WebAccessibilityObject();
@@ -1751,10 +1755,6 @@ bool WebViewImpl::setDropEffect(bool accept) {
   }
 }
 
-WebDevToolsAgent* WebViewImpl::GetWebDevToolsAgent() {
-  return GetWebDevToolsAgentImpl();
-}
-
 WebDevToolsAgentImpl* WebViewImpl::GetWebDevToolsAgentImpl() {
   return devtools_agent_.get();
 }
@@ -1869,11 +1869,6 @@ void WebViewImpl::SetIgnoreInputEvents(bool new_value) {
   ignore_input_events_ = new_value;
 }
 
-WebCore::Node* WebViewImpl::GetNodeForWindowPos(int x, int y) {
-  HitTestResult result = HitTestResultForWindowPos(IntPoint(x, y));
-  return result.innerNonSharedNode();
-}
-
 #if ENABLE(NOTIFICATIONS)
 WebKit::NotificationPresenterImpl* WebViewImpl::GetNotificationPresenter() {
   if (!notification_presenter_.isInitialized() && client())