OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/plugin/plugin_thread.h" | 5 #include "chrome/plugin/plugin_thread.h" |
6 | 6 |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 | 8 |
9 #if defined(USE_X11) | 9 #if defined(USE_X11) |
10 #include <gtk/gtk.h> | 10 #include <gtk/gtk.h> |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 OnNotifyRenderersOfPendingShutdown) | 136 OnNotifyRenderersOfPendingShutdown) |
137 IPC_END_MESSAGE_MAP() | 137 IPC_END_MESSAGE_MAP() |
138 } | 138 } |
139 | 139 |
140 void PluginThread::OnCreateChannel(int renderer_id, | 140 void PluginThread::OnCreateChannel(int renderer_id, |
141 bool off_the_record) { | 141 bool off_the_record) { |
142 scoped_refptr<PluginChannel> channel(PluginChannel::GetPluginChannel( | 142 scoped_refptr<PluginChannel> channel(PluginChannel::GetPluginChannel( |
143 renderer_id, ChildProcess::current()->io_message_loop())); | 143 renderer_id, ChildProcess::current()->io_message_loop())); |
144 IPC::ChannelHandle channel_handle; | 144 IPC::ChannelHandle channel_handle; |
145 if (channel.get()) { | 145 if (channel.get()) { |
146 channel_handle.name = channel->channel_name(); | 146 channel_handle.name = channel->channel_handle().name; |
147 #if defined(OS_POSIX) | 147 #if defined(OS_POSIX) |
148 // On POSIX, pass the renderer-side FD. | 148 // On POSIX, pass the renderer-side FD. |
149 channel_handle.socket = base::FileDescriptor(channel->renderer_fd(), false); | 149 channel_handle.socket = base::FileDescriptor(channel->renderer_fd(), false); |
150 #endif | 150 #endif |
151 channel->set_off_the_record(off_the_record); | 151 channel->set_off_the_record(off_the_record); |
152 } | 152 } |
153 | 153 |
154 Send(new PluginProcessHostMsg_ChannelCreated(channel_handle)); | 154 Send(new PluginProcessHostMsg_ChannelCreated(channel_handle)); |
155 } | 155 } |
156 | 156 |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 } | 225 } |
226 | 226 |
227 if (!result || net_error != net::OK) | 227 if (!result || net_error != net::OK) |
228 return false; | 228 return false; |
229 | 229 |
230 *proxy_list = proxy_result; | 230 *proxy_list = proxy_result; |
231 return true; | 231 return true; |
232 } | 232 } |
233 | 233 |
234 } // namespace webkit_glue | 234 } // namespace webkit_glue |
OLD | NEW |