Chromium Code Reviews| 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 "chrome/browser/nacl_host/nacl_process_host.h" | 5 #include "chrome/browser/nacl_host/nacl_process_host.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 761 // channel. | 761 // channel. |
| 762 if (!ipc_proxy_channel_.get()) { | 762 if (!ipc_proxy_channel_.get()) { |
| 763 ipc_proxy_channel_.reset( | 763 ipc_proxy_channel_.reset( |
| 764 new IPC::ChannelProxy(channel_handle, | 764 new IPC::ChannelProxy(channel_handle, |
| 765 IPC::Channel::MODE_CLIENT, | 765 IPC::Channel::MODE_CLIENT, |
| 766 &ipc_plugin_listener_, | 766 &ipc_plugin_listener_, |
| 767 base::MessageLoopProxy::current())); | 767 base::MessageLoopProxy::current())); |
| 768 // Create the browser ppapi host and enable PPAPI message dispatching to the | 768 // Create the browser ppapi host and enable PPAPI message dispatching to the |
| 769 // browser process. | 769 // browser process. |
| 770 ppapi_host_.reset(content::BrowserPpapiHost::CreateExternalPluginProcess( | 770 ppapi_host_.reset(content::BrowserPpapiHost::CreateExternalPluginProcess( |
| 771 ipc_proxy_channel_.get(), //process_.get(), // sender | 771 ipc_proxy_channel_.get(), // process_.get(), // sender |
|
dmichael (off chromium)
2012/12/12 23:23:38
Oops, this was my mistake. Please just remove the
ygorshenin1
2012/12/18 12:07:16
Done.
| |
| 772 permissions_, | 772 permissions_, |
| 773 process_->GetData().handle, | 773 process_->GetData().handle, |
| 774 process_->GetData().id, | 774 process_->GetData().id, |
| 775 process_->GetData().type, | |
|
dmichael (off chromium)
2013/01/10 05:57:16
I don't think you need this param. If you want to
ygorshenin1
2013/01/10 11:36:12
Done.
| |
| 775 ipc_proxy_channel_.get(), | 776 ipc_proxy_channel_.get(), |
| 776 chrome_render_message_filter_->GetHostResolver(), | 777 chrome_render_message_filter_->GetHostResolver(), |
| 777 chrome_render_message_filter_->render_process_id(), | 778 chrome_render_message_filter_->render_process_id(), |
| 778 render_view_id_)); | 779 render_view_id_)); |
| 779 | 780 |
| 780 // Send a message to create the NaCl-Renderer channel. The handle is just | 781 // Send a message to create the NaCl-Renderer channel. The handle is just |
| 781 // a place holder. | 782 // a place holder. |
| 782 ipc_proxy_channel_->Send( | 783 ipc_proxy_channel_->Send( |
| 783 new PpapiMsg_CreateNaClChannel( | 784 new PpapiMsg_CreateNaClChannel( |
| 784 chrome_render_message_filter_->render_process_id(), | 785 chrome_render_message_filter_->render_process_id(), |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 905 } else { | 906 } else { |
| 906 NaClStartDebugExceptionHandlerThread( | 907 NaClStartDebugExceptionHandlerThread( |
| 907 process_handle.Take(), info, | 908 process_handle.Take(), info, |
| 908 base::MessageLoopProxy::current(), | 909 base::MessageLoopProxy::current(), |
| 909 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, | 910 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, |
| 910 weak_factory_.GetWeakPtr())); | 911 weak_factory_.GetWeakPtr())); |
| 911 return true; | 912 return true; |
| 912 } | 913 } |
| 913 } | 914 } |
| 914 #endif | 915 #endif |
| OLD | NEW |