Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Side by Side Diff: content/plugin/plugin_thread.cc

Issue 6901146: Switch IPC::ChannelProxy to use MessageLoopProxy instead of MessageLoop. This allows us to remov... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/plugin/plugin_channel_base.cc ('k') | content/ppapi_plugin/ppapi_thread.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/plugin/plugin_thread.h" 5 #include "content/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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 IPC_MESSAGE_HANDLER(PluginProcessMsg_NotifyRenderersOfPendingShutdown, 114 IPC_MESSAGE_HANDLER(PluginProcessMsg_NotifyRenderersOfPendingShutdown,
115 OnNotifyRenderersOfPendingShutdown) 115 OnNotifyRenderersOfPendingShutdown)
116 IPC_MESSAGE_UNHANDLED(handled = false) 116 IPC_MESSAGE_UNHANDLED(handled = false)
117 IPC_END_MESSAGE_MAP() 117 IPC_END_MESSAGE_MAP()
118 return handled; 118 return handled;
119 } 119 }
120 120
121 void PluginThread::OnCreateChannel(int renderer_id, 121 void PluginThread::OnCreateChannel(int renderer_id,
122 bool incognito) { 122 bool incognito) {
123 scoped_refptr<PluginChannel> channel(PluginChannel::GetPluginChannel( 123 scoped_refptr<PluginChannel> channel(PluginChannel::GetPluginChannel(
124 renderer_id, ChildProcess::current()->io_message_loop())); 124 renderer_id, ChildProcess::current()->io_message_loop_proxy()));
125 IPC::ChannelHandle channel_handle; 125 IPC::ChannelHandle channel_handle;
126 if (channel.get()) { 126 if (channel.get()) {
127 channel_handle.name = channel->channel_handle().name; 127 channel_handle.name = channel->channel_handle().name;
128 #if defined(OS_POSIX) 128 #if defined(OS_POSIX)
129 // On POSIX, pass the renderer-side FD. 129 // On POSIX, pass the renderer-side FD.
130 channel_handle.socket = base::FileDescriptor(channel->renderer_fd(), false); 130 channel_handle.socket = base::FileDescriptor(channel->renderer_fd(), false);
131 #endif 131 #endif
132 channel->set_incognito(incognito); 132 channel->set_incognito(incognito);
133 } 133 }
134 134
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 bool result = ChildThread::current()->Send( 184 bool result = ChildThread::current()->Send(
185 new ChildProcessHostMsg_ResolveProxy(url, &net_error, &proxy_result)); 185 new ChildProcessHostMsg_ResolveProxy(url, &net_error, &proxy_result));
186 if (!result || net_error != net::OK) 186 if (!result || net_error != net::OK)
187 return false; 187 return false;
188 188
189 *proxy_list = proxy_result; 189 *proxy_list = proxy_result;
190 return true; 190 return true;
191 } 191 }
192 192
193 } // namespace webkit_glue 193 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « content/plugin/plugin_channel_base.cc ('k') | content/ppapi_plugin/ppapi_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698