Chromium Code Reviews| Index: content/renderer/devtools/devtools_agent.h |
| diff --git a/content/renderer/devtools/devtools_agent.h b/content/renderer/devtools/devtools_agent.h |
| index e2f953108d5c9baead574385ee376459ca99705d..bbc453b44a92fce99a3764059bd2ac7036dde229 100644 |
| --- a/content/renderer/devtools/devtools_agent.h |
| +++ b/content/renderer/devtools/devtools_agent.h |
| @@ -7,9 +7,6 @@ |
| #include <string> |
| -#include "base/atomicops.h" |
| -#include "base/basictypes.h" |
| -#include "base/time/time.h" |
| #include "content/public/common/console_message_level.h" |
| #include "content/public/renderer/render_frame_observer.h" |
| #include "third_party/WebKit/public/web/WebDevToolsAgentClient.h" |
| @@ -20,7 +17,7 @@ class WebDevToolsAgent; |
| namespace content { |
| -class RenderViewImpl; |
| +class RenderFrameImpl; |
| // DevToolsAgent belongs to the inspectable RenderView and provides Glue's |
|
Charlie Reis
2015/03/24 17:25:13
Let's update this comment.
dgozman
2015/03/25 16:25:50
Done.
|
| // agents with the communication capabilities. All messages from/to Glue's |
| @@ -29,7 +26,7 @@ class RenderViewImpl; |
| class DevToolsAgent : public RenderFrameObserver, |
| public blink::WebDevToolsAgentClient { |
| public: |
| - explicit DevToolsAgent(RenderFrame* main_render_frame); |
| + explicit DevToolsAgent(RenderFrameImpl* frame); |
| ~DevToolsAgent() override; |
| // Returns agent instance for its routing id. |
| @@ -54,21 +51,11 @@ class DevToolsAgent : public RenderFrameObserver, |
| void sendProtocolMessage(int call_id, |
| const blink::WebString& response, |
| const blink::WebString& state) override; |
| - long processId() override; |
| - int debuggerId() override; |
| blink::WebDevToolsAgentClient::WebKitClientMessageLoop* |
| createClientMessageLoop() override; |
| void willEnterDebugLoop() override; |
| void didExitDebugLoop() override; |
| - typedef void (*TraceEventCallback)( |
| - char phase, const unsigned char*, const char* name, unsigned long long id, |
| - int numArgs, const char* const* argNames, const unsigned char* argTypes, |
| - const unsigned long long* argValues, |
| - unsigned char flags, double timestamp); |
| - void resetTraceEventCallback() override; |
| - void setTraceEventCallback(const blink::WebString& category_filter, |
| - TraceEventCallback cb) override; |
| void enableTracing(const blink::WebString& category_filter) override; |
| void disableTracing() override; |
| @@ -83,26 +70,10 @@ class DevToolsAgent : public RenderFrameObserver, |
| void ContinueProgram(); |
| void OnSetupDevToolsClient(); |
| - RenderViewImpl* GetRenderViewImpl(); |
| - |
| - static void TraceEventCallbackWrapper( |
| - base::TimeTicks timestamp, |
| - char phase, |
| - const unsigned char* category_group_enabled, |
| - const char* name, |
| - unsigned long long id, |
| - int num_args, |
| - const char* const arg_names[], |
| - const unsigned char arg_types[], |
| - const unsigned long long arg_values[], |
| - unsigned char flags); |
| - |
| bool is_attached_; |
| bool is_devtools_client_; |
| bool paused_in_mouse_move_; |
| - RenderFrame* main_render_frame_; |
| - |
| - static base::subtle::AtomicWord /* TraceEventCallback */ event_callback_; |
| + RenderFrameImpl* frame_; |
| DISALLOW_COPY_AND_ASSIGN(DevToolsAgent); |
| }; |