| 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 775 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 786 // channel. | 786 // channel. |
| 787 if (!ipc_proxy_channel_.get()) { | 787 if (!ipc_proxy_channel_.get()) { |
| 788 ipc_proxy_channel_.reset( | 788 ipc_proxy_channel_.reset( |
| 789 new IPC::ChannelProxy(channel_handle, | 789 new IPC::ChannelProxy(channel_handle, |
| 790 IPC::Channel::MODE_CLIENT, | 790 IPC::Channel::MODE_CLIENT, |
| 791 &ipc_plugin_listener_, | 791 &ipc_plugin_listener_, |
| 792 base::MessageLoopProxy::current())); | 792 base::MessageLoopProxy::current())); |
| 793 // Create the browser ppapi host and enable PPAPI message dispatching to the | 793 // Create the browser ppapi host and enable PPAPI message dispatching to the |
| 794 // browser process. | 794 // browser process. |
| 795 ppapi_host_.reset(content::BrowserPpapiHost::CreateExternalPluginProcess( | 795 ppapi_host_.reset(content::BrowserPpapiHost::CreateExternalPluginProcess( |
| 796 ipc_proxy_channel_.get(), //process_.get(), // sender | 796 ipc_proxy_channel_.get(), // sender |
| 797 permissions_, | 797 permissions_, |
| 798 process_->GetData().handle, | 798 process_->GetData().handle, |
| 799 process_->GetData().type, |
| 799 ipc_proxy_channel_.get(), | 800 ipc_proxy_channel_.get(), |
| 800 chrome_render_message_filter_->GetHostResolver(), | 801 chrome_render_message_filter_->GetHostResolver(), |
| 801 chrome_render_message_filter_->render_process_id(), | 802 chrome_render_message_filter_->render_process_id(), |
| 802 render_view_id_)); | 803 render_view_id_)); |
| 803 | 804 |
| 804 // Send a message to create the NaCl-Renderer channel. The handle is just | 805 // Send a message to create the NaCl-Renderer channel. The handle is just |
| 805 // a place holder. | 806 // a place holder. |
| 806 ipc_proxy_channel_->Send( | 807 ipc_proxy_channel_->Send( |
| 807 new PpapiMsg_CreateNaClChannel( | 808 new PpapiMsg_CreateNaClChannel( |
| 808 chrome_render_message_filter_->render_process_id(), | 809 chrome_render_message_filter_->render_process_id(), |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 929 } else { | 930 } else { |
| 930 NaClStartDebugExceptionHandlerThread( | 931 NaClStartDebugExceptionHandlerThread( |
| 931 process_handle.Take(), info, | 932 process_handle.Take(), info, |
| 932 base::MessageLoopProxy::current(), | 933 base::MessageLoopProxy::current(), |
| 933 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, | 934 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, |
| 934 weak_factory_.GetWeakPtr())); | 935 weak_factory_.GetWeakPtr())); |
| 935 return true; | 936 return true; |
| 936 } | 937 } |
| 937 } | 938 } |
| 938 #endif | 939 #endif |
| OLD | NEW |