Chromium Code Reviews| Index: content/browser/devtools/render_view_devtools_agent_host.h |
| diff --git a/content/browser/devtools/render_view_devtools_agent_host.h b/content/browser/devtools/render_view_devtools_agent_host.h |
| index ae2cba39fbd90c398bcdb62b4169c4987fba6ee6..6e146c427e185deb0ca3ff29d3f9d7ee40d7c159 100644 |
| --- a/content/browser/devtools/render_view_devtools_agent_host.h |
| +++ b/content/browser/devtools/render_view_devtools_agent_host.h |
| @@ -11,11 +11,6 @@ |
| #include "base/compiler_specific.h" |
| #include "base/memory/scoped_ptr.h" |
| #include "content/browser/devtools/ipc_devtools_agent_host.h" |
| -#include "content/browser/devtools/protocol/dom_handler.h" |
| -#include "content/browser/devtools/protocol/input_handler.h" |
| -#include "content/browser/devtools/protocol/network_handler.h" |
| -#include "content/browser/devtools/protocol/page_handler.h" |
| -#include "content/browser/devtools/protocol/power_handler.h" |
| #include "content/common/content_export.h" |
| #include "content/public/browser/notification_observer.h" |
| #include "content/public/browser/notification_registrar.h" |
| @@ -28,7 +23,6 @@ class CompositorFrameMetadata; |
| namespace content { |
| class DevToolsProtocolHandlerImpl; |
| -class DevToolsTracingHandler; |
| class RendererOverridesHandler; |
| class RenderViewHost; |
| class RenderViewHostImpl; |
| @@ -37,6 +31,27 @@ class RenderViewHostImpl; |
| class PowerSaveBlockerImpl; |
| #endif |
| +namespace devtools { |
| +namespace dom { |
|
caseq
2014/10/16 12:07:21
here and below, collapse namespace ... { class ...
dgozman
2014/10/17 13:53:08
Done.
|
| +class DOMHandler; |
| +} |
| +namespace input { |
| +class InputHandler; |
| +} |
| +namespace network { |
| +class NetworkHandler; |
| +} |
| +namespace page { |
| +class PageHandler; |
| +} |
| +namespace power { |
| +class PowerHandler; |
| +} |
| +namespace tracing { |
| +class TracingHandler; |
| +} |
| +} |
| + |
| class CONTENT_EXPORT RenderViewDevToolsAgentHost |
| : public IPCDevToolsAgentHost, |
| private WebContentsObserver, |
| @@ -117,9 +132,9 @@ class CONTENT_EXPORT RenderViewDevToolsAgentHost |
| scoped_ptr<devtools::network::NetworkHandler> network_handler_; |
| scoped_ptr<devtools::page::PageHandler> page_handler_; |
| scoped_ptr<devtools::power::PowerHandler> power_handler_; |
| + scoped_ptr<devtools::tracing::TracingHandler> tracing_handler_; |
| scoped_ptr<DevToolsProtocolHandlerImpl> handler_impl_; |
| scoped_ptr<RendererOverridesHandler> overrides_handler_; |
| - scoped_ptr<DevToolsTracingHandler> tracing_handler_; |
| #if defined(OS_ANDROID) |
| scoped_ptr<PowerSaveBlockerImpl> power_save_blocker_; |
| #endif |