Index: content/browser/devtools/render_frame_devtools_agent_host.h |
diff --git a/content/browser/devtools/render_frame_devtools_agent_host.h b/content/browser/devtools/render_frame_devtools_agent_host.h |
index 984c0cba74e8164f7cad68ba3bb8256558f09bf0..3beef87ceb4d68ba5083f655154303aff29bf247 100644 |
--- a/content/browser/devtools/render_frame_devtools_agent_host.h |
+++ b/content/browser/devtools/render_frame_devtools_agent_host.h |
@@ -12,6 +12,7 @@ |
#include "base/macros.h" |
#include "build/build_config.h" |
#include "content/browser/devtools/devtools_agent_host_impl.h" |
+#include "content/browser/devtools/protocol/forward.h" |
#include "content/common/content_export.h" |
#include "content/public/browser/web_contents_observer.h" |
@@ -44,7 +45,6 @@ namespace dom { class DOMHandler; } |
namespace emulation { class EmulationHandler; } |
namespace input { class InputHandler; } |
namespace inspector { class InspectorHandler; } |
-namespace io { class IOHandler; } |
namespace network { class NetworkHandler; } |
namespace page { class PageHandler; } |
namespace schema { class SchemaHandler; } |
@@ -52,9 +52,13 @@ namespace security { class SecurityHandler; } |
namespace service_worker { class ServiceWorkerHandler; } |
namespace storage { class StorageHandler; } |
namespace target { class TargetHandler; } |
-namespace tracing { class TracingHandler; } |
} |
+namespace protocol { |
+class IOHandler; |
+class TracingHandler; |
+} // namespace protocol |
+ |
class CONTENT_EXPORT RenderFrameDevToolsAgentHost |
: public DevToolsAgentHostImpl, |
private WebContentsObserver { |
@@ -183,7 +187,7 @@ class CONTENT_EXPORT RenderFrameDevToolsAgentHost |
std::unique_ptr<devtools::dom::DOMHandler> dom_handler_; |
std::unique_ptr<devtools::input::InputHandler> input_handler_; |
std::unique_ptr<devtools::inspector::InspectorHandler> inspector_handler_; |
- std::unique_ptr<devtools::io::IOHandler> io_handler_; |
+ std::unique_ptr<protocol::IOHandler> io_handler_; |
std::unique_ptr<devtools::network::NetworkHandler> network_handler_; |
std::unique_ptr<devtools::page::PageHandler> page_handler_; |
std::unique_ptr<devtools::schema::SchemaHandler> schema_handler_; |
@@ -193,13 +197,14 @@ class CONTENT_EXPORT RenderFrameDevToolsAgentHost |
std::unique_ptr<devtools::storage::StorageHandler> |
storage_handler_; |
std::unique_ptr<devtools::target::TargetHandler> target_handler_; |
- std::unique_ptr<devtools::tracing::TracingHandler> tracing_handler_; |
+ std::unique_ptr<protocol::TracingHandler> tracing_handler_; |
std::unique_ptr<devtools::emulation::EmulationHandler> emulation_handler_; |
std::unique_ptr<DevToolsFrameTraceRecorder> frame_trace_recorder_; |
#if defined(OS_ANDROID) |
std::unique_ptr<device::PowerSaveBlocker> power_save_blocker_; |
#endif |
std::unique_ptr<DevToolsProtocolHandler> protocol_handler_; |
+ std::unique_ptr<protocol::UberDispatcher> protocol_dispatcher_; |
RenderFrameHostImpl* handlers_frame_host_; |
bool current_frame_crashed_; |