| Index: content/browser/devtools/render_frame_devtools_agent_host.cc
|
| diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc
|
| index 676ae216d4fd86cd05d892972e87845f0f78ed6f..29d536708903ca22a66b186dfdc13e1b2eb6baec 100644
|
| --- a/content/browser/devtools/render_frame_devtools_agent_host.cc
|
| +++ b/content/browser/devtools/render_frame_devtools_agent_host.cc
|
| @@ -5,7 +5,6 @@
|
| #include "content/browser/devtools/render_frame_devtools_agent_host.h"
|
|
|
| #include "base/basictypes.h"
|
| -#include "base/json/json_writer.h"
|
| #include "base/lazy_instance.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "content/browser/child_process_security_policy_impl.h"
|
| @@ -29,7 +28,6 @@
|
| #include "content/common/view_messages.h"
|
| #include "content/public/browser/browser_context.h"
|
| #include "content/public/browser/content_browser_client.h"
|
| -#include "content/public/browser/devtools_manager_delegate.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/notification_types.h"
|
| #include "content/public/browser/render_widget_host_iterator.h"
|
| @@ -147,9 +145,6 @@ RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost(RenderFrameHost* rfh)
|
| devtools::tracing::TracingHandler::Renderer)),
|
| emulation_handler_(new devtools::emulation::EmulationHandler(
|
| page_handler_.get())),
|
| - protocol_handler_(new DevToolsProtocolHandler(
|
| - base::Bind(&RenderFrameDevToolsAgentHost::DispatchOnInspectorFrontend,
|
| - base::Unretained(this)))),
|
| frame_trace_recorder_(new DevToolsFrameTraceRecorder()),
|
| reattaching_(false) {
|
| DevToolsProtocolDispatcher* dispatcher = protocol_handler_->dispatcher();
|
| @@ -177,32 +172,6 @@ WebContents* RenderFrameDevToolsAgentHost::GetWebContents() {
|
| return web_contents();
|
| }
|
|
|
| -void RenderFrameDevToolsAgentHost::DispatchProtocolMessage(
|
| - const std::string& message) {
|
| - scoped_ptr<base::DictionaryValue> command =
|
| - protocol_handler_->ParseCommand(message);
|
| - if (!command)
|
| - return;
|
| -
|
| - DevToolsManagerDelegate* delegate =
|
| - DevToolsManager::GetInstance()->delegate();
|
| - if (delegate) {
|
| - scoped_ptr<base::DictionaryValue> response(
|
| - delegate->HandleCommand(this, command.get()));
|
| - if (response) {
|
| - std::string json_response;
|
| - base::JSONWriter::Write(response.get(), &json_response);
|
| - DispatchOnInspectorFrontend(json_response);
|
| - return;
|
| - }
|
| - }
|
| -
|
| - if (protocol_handler_->HandleOptionalCommand(command.Pass()))
|
| - return;
|
| -
|
| - IPCDevToolsAgentHost::DispatchProtocolMessage(message);
|
| -}
|
| -
|
| void RenderFrameDevToolsAgentHost::SendMessageToAgent(IPC::Message* msg) {
|
| if (!render_frame_host_)
|
| return;
|
| @@ -557,13 +526,6 @@ void RenderFrameDevToolsAgentHost::OnDispatchOnInspectorFrontend(
|
| ProcessChunkedMessageFromAgent(message);
|
| }
|
|
|
| -void RenderFrameDevToolsAgentHost::DispatchOnInspectorFrontend(
|
| - const std::string& message) {
|
| - if (!IsAttached() || !render_frame_host_)
|
| - return;
|
| - SendMessageToClient(message);
|
| -}
|
| -
|
| bool RenderFrameDevToolsAgentHost::IsChildFrame() {
|
| return render_frame_host_ && render_frame_host_->GetParent();
|
| }
|
|
|