OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "chrome/renderer/devtools_agent_filter.h" | 5 #include "chrome/renderer/devtools_agent_filter.h" |
6 | 6 |
7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
8 #include "chrome/common/devtools_messages.h" | 8 #include "chrome/common/devtools_messages.h" |
9 #include "chrome/renderer/devtools_agent.h" | 9 #include "chrome/renderer/devtools_agent.h" |
10 #include "chrome/renderer/plugin_channel_host.h" | 10 #include "chrome/renderer/plugin_channel_host.h" |
11 #include "chrome/renderer/render_view.h" | 11 #include "chrome/renderer/render_view.h" |
| 12 #include "webkit/api/public/WebString.h" |
12 #include "webkit/glue/webdevtoolsagent.h" | 13 #include "webkit/glue/webdevtoolsagent.h" |
13 | 14 |
| 15 using WebKit::WebString; |
| 16 |
14 // static | 17 // static |
15 void DevToolsAgentFilter::DispatchMessageLoop() { | 18 void DevToolsAgentFilter::DispatchMessageLoop() { |
16 MessageLoop* current = MessageLoop::current(); | 19 MessageLoop* current = MessageLoop::current(); |
17 bool old_state = current->NestableTasksAllowed(); | 20 bool old_state = current->NestableTasksAllowed(); |
18 current->SetNestableTasksAllowed(true); | 21 current->SetNestableTasksAllowed(true); |
19 current->RunAllPending(); | 22 current->RunAllPending(); |
20 current->SetNestableTasksAllowed(old_state); | 23 current->SetNestableTasksAllowed(old_state); |
21 } | 24 } |
22 | 25 |
23 DevToolsAgentFilter::DevToolsAgentFilter() | 26 DevToolsAgentFilter::DevToolsAgentFilter() |
(...skipping 14 matching lines...) Expand all Loading... |
38 IPC_MESSAGE_HANDLER(DevToolsAgentMsg_DebuggerCommand, OnDebuggerCommand) | 41 IPC_MESSAGE_HANDLER(DevToolsAgentMsg_DebuggerCommand, OnDebuggerCommand) |
39 IPC_MESSAGE_UNHANDLED(handled = false) | 42 IPC_MESSAGE_UNHANDLED(handled = false) |
40 IPC_END_MESSAGE_MAP() | 43 IPC_END_MESSAGE_MAP() |
41 return handled; | 44 return handled; |
42 } else { | 45 } else { |
43 return false; | 46 return false; |
44 } | 47 } |
45 } | 48 } |
46 | 49 |
47 void DevToolsAgentFilter::OnDebuggerCommand(const std::string& command) { | 50 void DevToolsAgentFilter::OnDebuggerCommand(const std::string& command) { |
48 WebDevToolsAgent::ExecuteDebuggerCommand(command, current_routing_id_); | 51 WebDevToolsAgent::ExecuteDebuggerCommand( |
| 52 WebString::fromUTF8(command), current_routing_id_); |
49 } | 53 } |
OLD | NEW |