OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/devtools/devtools_agent.h" | 5 #include "content/renderer/devtools/devtools_agent.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 | 8 |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
89 IPC_MESSAGE_HANDLER(DevToolsAgentMsg_DispatchOnInspectorBackend, | 89 IPC_MESSAGE_HANDLER(DevToolsAgentMsg_DispatchOnInspectorBackend, |
90 OnDispatchOnInspectorBackend) | 90 OnDispatchOnInspectorBackend) |
91 IPC_MESSAGE_HANDLER(DevToolsAgentMsg_InspectElement, OnInspectElement) | 91 IPC_MESSAGE_HANDLER(DevToolsAgentMsg_InspectElement, OnInspectElement) |
92 IPC_MESSAGE_HANDLER(DevToolsAgentMsg_AddMessageToConsole, | 92 IPC_MESSAGE_HANDLER(DevToolsAgentMsg_AddMessageToConsole, |
93 OnAddMessageToConsole) | 93 OnAddMessageToConsole) |
94 IPC_MESSAGE_HANDLER(DevToolsMsg_SetupDevToolsClient, OnSetupDevToolsClient) | 94 IPC_MESSAGE_HANDLER(DevToolsMsg_SetupDevToolsClient, OnSetupDevToolsClient) |
95 IPC_MESSAGE_UNHANDLED(handled = false) | 95 IPC_MESSAGE_UNHANDLED(handled = false) |
96 IPC_END_MESSAGE_MAP() | 96 IPC_END_MESSAGE_MAP() |
97 | 97 |
98 if (message.type() == FrameMsg_Navigate::ID || | 98 if (message.type() == FrameMsg_Navigate::ID || |
99 message.type() == ViewMsg_Close::ID) | 99 message.type() == ViewMsg_Close::ID) |
dgozman
2015/03/30 17:04:36
This message is no longer catch in RenderFrameObse
| |
100 ContinueProgram(); // Don't want to swallow the message. | 100 ContinueProgram(); // Don't want to swallow the message. |
101 | 101 |
102 return handled; | 102 return handled; |
103 } | 103 } |
104 | 104 |
105 void DevToolsAgent::FrameWillClose() { | |
Charlie Reis
2015/03/30 18:37:17
Why do you need both? In your comment you mention
dgozman
2015/03/30 18:43:32
This one is here just to show what I was talking a
| |
106 ContinueProgram(); | |
107 } | |
108 | |
109 void DevToolsAgent::WidgetWillClose() { | |
110 ContinueProgram(); | |
111 } | |
112 | |
105 void DevToolsAgent::sendProtocolMessage( | 113 void DevToolsAgent::sendProtocolMessage( |
106 int call_id, | 114 int call_id, |
107 const blink::WebString& message, | 115 const blink::WebString& message, |
108 const blink::WebString& state_cookie) { | 116 const blink::WebString& state_cookie) { |
109 SendChunkedProtocolMessage( | 117 SendChunkedProtocolMessage( |
110 this, routing_id(), call_id, message.utf8(), state_cookie.utf8()); | 118 this, routing_id(), call_id, message.utf8(), state_cookie.utf8()); |
111 } | 119 } |
112 | 120 |
113 blink::WebDevToolsAgentClient::WebKitClientMessageLoop* | 121 blink::WebDevToolsAgentClient::WebKitClientMessageLoop* |
114 DevToolsAgent::createClientMessageLoop() { | 122 DevToolsAgent::createClientMessageLoop() { |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
268 WebDevToolsAgent* DevToolsAgent::GetWebAgent() { | 276 WebDevToolsAgent* DevToolsAgent::GetWebAgent() { |
269 WebLocalFrame* web_frame = frame_->GetWebFrame(); | 277 WebLocalFrame* web_frame = frame_->GetWebFrame(); |
270 return web_frame ? web_frame->devToolsAgent() : nullptr; | 278 return web_frame ? web_frame->devToolsAgent() : nullptr; |
271 } | 279 } |
272 | 280 |
273 bool DevToolsAgent::IsAttached() { | 281 bool DevToolsAgent::IsAttached() { |
274 return is_attached_; | 282 return is_attached_; |
275 } | 283 } |
276 | 284 |
277 } // namespace content | 285 } // namespace content |
OLD | NEW |