1 files changed, 7 insertions, 88 deletions

diff --git a/WebKit/chromium/src/WebDevToolsFrontendImpl.h b/WebKit/chromium/src/WebDevToolsFrontendImpl.h
index 62b34da..866a1cb 100644
--- a/WebKit/chromium/src/WebDevToolsFrontendImpl.h
+++ b/WebKit/chromium/src/WebDevToolsFrontendImpl.h
@@ -31,11 +31,10 @@
 #ifndef WebDevToolsFrontendImpl_h
 #define WebDevToolsFrontendImpl_h
 
-#include "ContextMenu.h"
-#include "ContextMenuProvider.h"
-#include "DevToolsRPC.h"
+#include "PlatformString.h"
 #include "WebDevToolsFrontend.h"
 #include <v8.h>
+#include <wtf/Forward.h>
 #include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/OwnPtr.h>
@@ -46,20 +45,17 @@ namespace WebCore {
 class ContextMenuItem;
 class Node;
 class Page;
-class String;
 }
 
 namespace WebKit {
 
-class JSDebuggerAgentBoundObj;
-class JSProfilerAgentBoundObj;
-class JSToolsAgentBoundObj;
 class WebDevToolsClientDelegate;
 class WebViewImpl;
 struct WebDevToolsMessageData;
 
+using WTF::String;
+
 class WebDevToolsFrontendImpl : public WebKit::WebDevToolsFrontend
-                              , public DevToolsRPC::Delegate
                               , public Noncopyable {
 public:
     WebDevToolsFrontendImpl(
@@ -68,92 +64,15 @@ public:
         const String& applicationLocale);
     virtual ~WebDevToolsFrontendImpl();
 
-    // DevToolsRPC::Delegate implementation.
-    virtual void sendRpcMessage(const WebKit::WebDevToolsMessageData& data);
-
     // WebDevToolsFrontend implementation.
-    virtual void dispatchMessageFromAgent(const WebKit::WebDevToolsMessageData& data);
-
-private:
-    class MenuProvider : public WebCore::ContextMenuProvider {
-    public:
-        static PassRefPtr<MenuProvider> create(WebDevToolsFrontendImpl* frontendHost, const Vector<WebCore::ContextMenuItem*>& items)
-        {
-            return adoptRef(new MenuProvider(frontendHost, items));
-        }
-
-        virtual ~MenuProvider()
-        {
-            contextMenuCleared();
-        }
-
-        void disconnect()
-        {
-            m_frontendHost = 0;
-        }
-
-        virtual void populateContextMenu(WebCore::ContextMenu* menu)
-        {
-            for (size_t i = 0; i < m_items.size(); ++i)
-                menu->appendItem(*m_items[i]);
-        }
+    virtual void dispatchOnInspectorFrontend(const WebString& message);
 
-        virtual void contextMenuItemSelected(WebCore::ContextMenuItem* item)
-        {
-            if (m_frontendHost)
-                m_frontendHost->contextMenuItemSelected(item);
-        }
-
-        virtual void contextMenuCleared()
-        {
-            if (m_frontendHost)
-                m_frontendHost->contextMenuCleared();
-            deleteAllValues(m_items);
-            m_items.clear();
-        }
-
-    private:
-        MenuProvider(WebDevToolsFrontendImpl* frontendHost, const Vector<WebCore::ContextMenuItem*>& items)
-            : m_frontendHost(frontendHost)
-            , m_items(items) { }
-        WebDevToolsFrontendImpl* m_frontendHost;
-        Vector<WebCore::ContextMenuItem*> m_items;
-    };
-
-    void executeScript(const Vector<String>& v);
-    void dispatchOnWebInspector(const String& method, const String& param);
-
-    // friend class MenuSelectionHandler;
-    void contextMenuItemSelected(WebCore::ContextMenuItem* menuItem);
-    void contextMenuCleared();
-
-    static v8::Handle<v8::Value> jsLoaded(const v8::Arguments& args);
-    static v8::Handle<v8::Value> jsPlatform(const v8::Arguments& args);
-    static v8::Handle<v8::Value> jsPort(const v8::Arguments& args);
-    static v8::Handle<v8::Value> jsCopyText(const v8::Arguments& args);
-
-    static v8::Handle<v8::Value> jsActivateWindow(const v8::Arguments& args);
-    static v8::Handle<v8::Value> jsCloseWindow(const v8::Arguments& args);
-    static v8::Handle<v8::Value> jsDockWindow(const v8::Arguments& args);
-    static v8::Handle<v8::Value> jsUndockWindow(const v8::Arguments& args);
-    static v8::Handle<v8::Value> jsLocalizedStringsURL(const v8::Arguments& args);
-    static v8::Handle<v8::Value> jsHiddenPanels(const v8::Arguments& args);
-    static v8::Handle<v8::Value> jsDebuggerCommand(const v8::Arguments& args);
-    static v8::Handle<v8::Value> jsSetting(const v8::Arguments& args);
-    static v8::Handle<v8::Value> jsSetSetting(const v8::Arguments& args);
-    static v8::Handle<v8::Value> jsDebuggerPauseScript(const v8::Arguments& args);
-    static v8::Handle<v8::Value> jsWindowUnloading(const v8::Arguments& args);
-    static v8::Handle<v8::Value> jsShowContextMenu(const v8::Arguments& args);
+    void frontendLoaded();
 
+private:
     WebKit::WebViewImpl* m_webViewImpl;
     WebKit::WebDevToolsFrontendClient* m_client;
     String m_applicationLocale;
-    OwnPtr<JSDebuggerAgentBoundObj> m_debuggerAgentObj;
-    OwnPtr<JSProfilerAgentBoundObj> m_profilerAgentObj;
-    OwnPtr<JSToolsAgentBoundObj> m_toolsAgentObj;
-    bool m_loaded;
-    Vector<Vector<String> > m_pendingIncomingMessages;
-    RefPtr<MenuProvider> m_menuProvider;
 };
 
 } // namespace WebKit