| 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/java/java_bridge_channel.h" | 5 #include "content/renderer/java/java_bridge_channel.h" |
| 6 | 6 |
| 7 #include "content/child/child_process.h" |
| 7 #include "content/child/plugin_messages.h" | 8 #include "content/child/plugin_messages.h" |
| 8 #include "content/common/child_process.h" | |
| 9 #include "content/common/java_bridge_messages.h" | 9 #include "content/common/java_bridge_messages.h" |
| 10 | 10 |
| 11 namespace content { | 11 namespace content { |
| 12 | 12 |
| 13 JavaBridgeChannel* JavaBridgeChannel::GetJavaBridgeChannel( | 13 JavaBridgeChannel* JavaBridgeChannel::GetJavaBridgeChannel( |
| 14 const IPC::ChannelHandle& channel_handle, | 14 const IPC::ChannelHandle& channel_handle, |
| 15 base::MessageLoopProxy* ipc_message_loop) { | 15 base::MessageLoopProxy* ipc_message_loop) { |
| 16 return static_cast<JavaBridgeChannel*>(NPChannelBase::GetChannel( | 16 return static_cast<JavaBridgeChannel*>(NPChannelBase::GetChannel( |
| 17 channel_handle, | 17 channel_handle, |
| 18 IPC::Channel::MODE_CLIENT, | 18 IPC::Channel::MODE_CLIENT, |
| (...skipping 28 matching lines...) Expand all Loading... |
| 47 // This is because, unlike in the case of plugins, the host does not need to | 47 // This is because, unlike in the case of plugins, the host does not need to |
| 48 // pump the message queue to avoid hangs. | 48 // pump the message queue to avoid hangs. |
| 49 if (msg.type() == PluginMsg_SignalModalDialogEvent::ID || | 49 if (msg.type() == PluginMsg_SignalModalDialogEvent::ID || |
| 50 msg.type() == PluginMsg_ResetModalDialogEvent::ID) { | 50 msg.type() == PluginMsg_ResetModalDialogEvent::ID) { |
| 51 return true; | 51 return true; |
| 52 } | 52 } |
| 53 return NPChannelBase::OnControlMessageReceived(msg); | 53 return NPChannelBase::OnControlMessageReceived(msg); |
| 54 } | 54 } |
| 55 | 55 |
| 56 } // namespace content | 56 } // namespace content |
| OLD | NEW |