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

Side by Side Diff: trunk/src/components/nacl/browser/nacl_process_host.cc

Issue 312553004: Revert 274310 "Introduce IPC::ChannelProxy::Create*() and IPC::S..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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
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 "components/nacl/browser/nacl_process_host.h" 5 #include "components/nacl/browser/nacl_process_host.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after
898 if (!enable_ppapi_proxy()) { 898 if (!enable_ppapi_proxy()) {
899 ReplyToRenderer(IPC::ChannelHandle(), 899 ReplyToRenderer(IPC::ChannelHandle(),
900 trusted_renderer_channel_handle, 900 trusted_renderer_channel_handle,
901 manifest_service_channel_handle); 901 manifest_service_channel_handle);
902 return; 902 return;
903 } 903 }
904 904
905 if (!ipc_proxy_channel_.get()) { 905 if (!ipc_proxy_channel_.get()) {
906 DCHECK_EQ(PROCESS_TYPE_NACL_LOADER, process_->GetData().process_type); 906 DCHECK_EQ(PROCESS_TYPE_NACL_LOADER, process_->GetData().process_type);
907 907
908 ipc_proxy_channel_ = IPC::ChannelProxy::CreateClient( 908 ipc_proxy_channel_.reset(
909 browser_channel_handle, 909 new IPC::ChannelProxy(browser_channel_handle,
910 NULL, 910 IPC::Channel::MODE_CLIENT,
911 base::MessageLoopProxy::current().get()); 911 NULL,
912 base::MessageLoopProxy::current().get()));
912 // Create the browser ppapi host and enable PPAPI message dispatching to the 913 // Create the browser ppapi host and enable PPAPI message dispatching to the
913 // browser process. 914 // browser process.
914 ppapi_host_.reset(content::BrowserPpapiHost::CreateExternalPluginProcess( 915 ppapi_host_.reset(content::BrowserPpapiHost::CreateExternalPluginProcess(
915 ipc_proxy_channel_.get(), // sender 916 ipc_proxy_channel_.get(), // sender
916 permissions_, 917 permissions_,
917 process_->GetData().handle, 918 process_->GetData().handle,
918 ipc_proxy_channel_.get(), 919 ipc_proxy_channel_.get(),
919 nacl_host_message_filter_->render_process_id(), 920 nacl_host_message_filter_->render_process_id(),
920 render_view_id_, 921 render_view_id_,
921 profile_directory_)); 922 profile_directory_));
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 process_handle.Take(), info, 1131 process_handle.Take(), info,
1131 base::MessageLoopProxy::current(), 1132 base::MessageLoopProxy::current(),
1132 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, 1133 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
1133 weak_factory_.GetWeakPtr())); 1134 weak_factory_.GetWeakPtr()));
1134 return true; 1135 return true;
1135 } 1136 }
1136 } 1137 }
1137 #endif 1138 #endif
1138 1139
1139 } // namespace nacl 1140 } // namespace nacl
OLDNEW
« no previous file with comments | « trunk/src/chrome/service/service_ipc_server.cc ('k') | trunk/src/components/nacl/loader/nacl_listener.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698