Index: third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
diff --git a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
index 9e6a8845516d51fed54d7d3eda3483415d18186a..b4091c46b4b9de4abc8eb80730d2d844f1824bbe 100644 |
--- a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
@@ -71,13 +71,13 @@ |
#include "modules/indexeddb/InspectorIndexedDBAgent.h" |
#include "modules/storage/InspectorDOMStorageAgent.h" |
#include "modules/webdatabase/InspectorDatabaseAgent.h" |
-#include "platform/JSONValues.h" |
#include "platform/RuntimeEnabledFeatures.h" |
#include "platform/TraceEvent.h" |
#include "platform/graphics/GraphicsContext.h" |
#include "platform/graphics/paint/PaintController.h" |
#include "platform/inspector_protocol/Dispatcher.h" |
#include "platform/inspector_protocol/Frontend.h" |
+#include "platform/inspector_protocol/Values.h" |
#include "public/platform/Platform.h" |
#include "public/platform/WebLayerTreeView.h" |
#include "public/platform/WebRect.h" |
@@ -485,7 +485,7 @@ void WebDevToolsAgentImpl::initializeDeferredAgents() |
m_pageConsoleAgent->setDebuggerAgent(debuggerAgent->v8Agent()); |
m_pageRuntimeAgent->v8Agent()->setClearConsoleCallback(bind<>(&InspectorConsoleAgent::clearAllMessages, m_pageConsoleAgent.get())); |
- m_pageRuntimeAgent->v8Agent()->setInspectObjectCallback(bind<PassOwnPtr<protocol::Runtime::RemoteObject>, PassRefPtr<JSONObject>>(&InspectorInspectorAgent::inspect, m_inspectorAgent.get())); |
+ m_pageRuntimeAgent->v8Agent()->setInspectObjectCallback(bind<PassOwnPtr<protocol::Runtime::RemoteObject>, PassRefPtr<protocol::DictionaryValue>>(&InspectorInspectorAgent::inspect, m_inspectorAgent.get())); |
if (m_overlay) |
m_overlay->init(cssAgent, debuggerAgent, m_domAgent.get()); |
@@ -642,7 +642,7 @@ void WebDevToolsAgentImpl::failedToRequestDevTools() |
ClientMessageLoopAdapter::resumeForCreateWindow(); |
} |
-void WebDevToolsAgentImpl::sendProtocolResponse(int sessionId, int callId, PassRefPtr<JSONObject> message) |
+void WebDevToolsAgentImpl::sendProtocolResponse(int sessionId, int callId, PassRefPtr<protocol::DictionaryValue> message) |
{ |
if (!m_attached) |
return; |
@@ -659,7 +659,7 @@ void WebDevToolsAgentImpl::sendProtocolResponse(int sessionId, int callId, PassR |
m_client->sendProtocolMessage(sessionId, callId, message->toJSONString(), stateToSend); |
} |
-void WebDevToolsAgentImpl::sendProtocolNotification(PassRefPtr<JSONObject> message) |
+void WebDevToolsAgentImpl::sendProtocolNotification(PassRefPtr<protocol::DictionaryValue> message) |
{ |
if (!m_attached) |
return; |