4 files changed, 24 insertions, 13 deletions
diff --git a/webkit/glue/devtools/debugger_agent_impl.cc b/webkit/glue/devtools/debugger_agent_impl.cc
index 9080869..a32b9a2 100644
--- a/webkit/glue/devtools/debugger_agent_impl.cc
+++ b/webkit/glue/devtools/debugger_agent_impl.cc
@@ -9,6 +9,7 @@
 #include <wtf/Vector.h>
 
 #include "Document.h"
+#include "Frame.h"
 #include "Page.h"
 #include "V8Binding.h"
 #include "V8DOMWindow.h"
@@ -17,12 +18,12 @@
 #undef LOG
 
 #include "grit/webkit_resources.h"
+#include "webkit/api/src/WebViewImpl.h"
 #include "webkit/glue/devtools/debugger_agent_impl.h"
 #include "webkit/glue/devtools/debugger_agent_manager.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webdevtoolsagent_impl.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/webview_impl.h"
 
 using WebCore::DOMWindow;
 using WebCore::Document;
@@ -34,6 +35,7 @@ using WebCore::V8Custom;
 using WebCore::V8DOMWindow;
 using WebCore::V8DOMWrapper;
 using WebCore::V8Proxy;
+using WebKit::WebViewImpl;
 
 DebuggerAgentImpl::DebuggerAgentImpl(
     WebViewImpl* web_view_impl,
diff --git a/webkit/glue/devtools/debugger_agent_impl.h b/webkit/glue/devtools/debugger_agent_impl.h
index 0659dd7..95ea2d8 100644
--- a/webkit/glue/devtools/debugger_agent_impl.h
+++ b/webkit/glue/devtools/debugger_agent_impl.h
@@ -12,7 +12,6 @@
 #include "webkit/glue/devtools/debugger_agent.h"
 
 class WebDevToolsAgentImpl;
-class WebViewImpl;
 
 namespace WebCore {
 class Document;
@@ -21,13 +20,17 @@ class Page;
 class String;
 }
 
+namespace WebKit {
+class WebViewImpl;
+}
+
 class DebuggerAgentImpl : public DebuggerAgent {
  public:
   // Creates utility context with injected js agent.
   static void CreateUtilityContext(WebCore::Frame* frame,
                                    v8::Persistent<v8::Context>* context);
 
-  DebuggerAgentImpl(WebViewImpl* web_view_impl,
+  DebuggerAgentImpl(WebKit::WebViewImpl* web_view_impl,
                     DebuggerAgentDelegate* delegate,
                     WebDevToolsAgentImpl* webdevtools_agent);
   virtual ~DebuggerAgentImpl();
@@ -66,10 +69,10 @@ class DebuggerAgentImpl : public DebuggerAgent {
   WebCore::Page* GetPage();
   WebDevToolsAgentImpl* webdevtools_agent() { return webdevtools_agent_; };
 
-  WebViewImpl* web_view() { return web_view_impl_; }
+  WebKit::WebViewImpl* web_view() { return web_view_impl_; }
 
  private:
-  WebViewImpl* web_view_impl_;
+  WebKit::WebViewImpl* web_view_impl_;
   DebuggerAgentDelegate* delegate_;
   WebDevToolsAgentImpl* webdevtools_agent_;
   int profiler_log_position_;
diff --git a/webkit/glue/devtools/debugger_agent_manager.cc b/webkit/glue/devtools/debugger_agent_manager.cc
index edf6738..2cfb459 100644
--- a/webkit/glue/devtools/debugger_agent_manager.cc
+++ b/webkit/glue/devtools/debugger_agent_manager.cc
@@ -11,16 +11,19 @@
 #undef LOG
 
 #include "webkit/api/public/WebDevToolsAgent.h"
+#include "webkit/api/src/WebFrameImpl.h"
+#include "webkit/api/src/WebViewImpl.h"
 #include "webkit/glue/devtools/debugger_agent_impl.h"
 #include "webkit/glue/devtools/debugger_agent_manager.h"
 #include "webkit/glue/webdevtoolsagent_impl.h"
-#include "webkit/glue/webview_impl.h"
 
 #if USE(V8)
 #include "v8/include/v8-debug.h"
 #endif
 
 using WebKit::WebDevToolsAgent;
+using WebKit::WebFrameImpl;
+using WebKit::WebViewImpl;
 
 WebDevToolsAgent::MessageLoopDispatchHandler
     DebuggerAgentManager::message_loop_dispatch_handler_ = NULL;
@@ -77,7 +80,7 @@ void DebuggerAgentManager::V8DebugHostDispatchHandler() {
         agent->web_view(),
         new WebCore::PageGroupLoadDeferrer(agent->GetPage(), true));
     views.append(agent->web_view());
-    agent->web_view()->SetIgnoreInputEvents(true);
+    agent->web_view()->setIgnoreInputEvents(true);
   }
 
   // 2. Process messages.
@@ -89,7 +92,7 @@ void DebuggerAgentManager::V8DebugHostDispatchHandler() {
        ++it) {
     if (page_deferrers_.contains(*it)) {
       // The view was not closed during the dispatch.
-      (*it)->SetIgnoreInputEvents(false);
+      (*it)->setIgnoreInputEvents(false);
     }
   }
   deleteAllValues(page_deferrers_);
diff --git a/webkit/glue/devtools/debugger_agent_manager.h b/webkit/glue/devtools/debugger_agent_manager.h
index 22a1f93..3d49ed7 100644
--- a/webkit/glue/devtools/debugger_agent_manager.h
+++ b/webkit/glue/devtools/debugger_agent_manager.h
@@ -15,10 +15,13 @@ namespace WebCore {
 class PageGroupLoadDeferrer;
 }
 
-class DebuggerAgentImpl;
-class DictionaryValue;
+namespace WebKit {
 class WebFrameImpl;
 class WebViewImpl;
+}
+
+class DebuggerAgentImpl;
+class DictionaryValue;
 
 // There is single v8 instance per render process. Also there may be several
 // RenderViews and consequently devtools agents in the process that want to talk
@@ -46,9 +49,9 @@ class DebuggerAgentManager : public Noncopyable {
 
   // Sets |host_id| as the frame context data. This id is used to filter scripts
   // related to the inspected page.
-  static void SetHostId(WebFrameImpl* webframe, int host_id);
+  static void SetHostId(WebKit::WebFrameImpl* webframe, int host_id);
 
-  static void OnWebViewClosed(WebViewImpl* webview);
+  static void OnWebViewClosed(WebKit::WebViewImpl* webview);
 
   static void OnNavigate();
 
@@ -86,7 +89,7 @@ class DebuggerAgentManager : public Noncopyable {
   static WebKit::WebDevToolsAgent::MessageLoopDispatchHandler
       message_loop_dispatch_handler_;
   static bool in_host_dispatch_handler_;
-  typedef HashMap<WebViewImpl*, WebCore::PageGroupLoadDeferrer*>
+  typedef HashMap<WebKit::WebViewImpl*, WebCore::PageGroupLoadDeferrer*>
       DeferrersMap;
   static DeferrersMap page_deferrers_;