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

Side by Side Diff: chrome/browser/nacl_host/nacl_process_host.cc

Issue 11437038: Revert 171408 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years 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 | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/nacl/nacl_ipc_adapter.cc » ('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) 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 753 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
772 permissions_, 772 permissions_,
773 process_->GetData().handle, 773 process_->GetData().handle,
774 process_->GetData().id,
775 ipc_proxy_channel_.get(), 774 ipc_proxy_channel_.get(),
776 chrome_render_message_filter_->GetHostResolver(), 775 chrome_render_message_filter_->GetHostResolver(),
777 chrome_render_message_filter_->render_process_id(), 776 chrome_render_message_filter_->render_process_id(),
778 render_view_id_)); 777 render_view_id_));
779 778
780 // Send a message to create the NaCl-Renderer channel. The handle is just 779 // Send a message to create the NaCl-Renderer channel. The handle is just
781 // a place holder. 780 // a place holder.
782 ipc_proxy_channel_->Send( 781 ipc_proxy_channel_->Send(
783 new PpapiMsg_CreateNaClChannel( 782 new PpapiMsg_CreateNaClChannel(
784 chrome_render_message_filter_->render_process_id(), 783 chrome_render_message_filter_->render_process_id(),
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
905 } else { 904 } else {
906 NaClStartDebugExceptionHandlerThread( 905 NaClStartDebugExceptionHandlerThread(
907 process_handle.Take(), info, 906 process_handle.Take(), info,
908 base::MessageLoopProxy::current(), 907 base::MessageLoopProxy::current(),
909 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, 908 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
910 weak_factory_.GetWeakPtr())); 909 weak_factory_.GetWeakPtr()));
911 return true; 910 return true;
912 } 911 }
913 } 912 }
914 #endif 913 #endif
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/nacl/nacl_ipc_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698