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

Unified Diff: content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc

Issue 11441012: PPB_UDPSocket_Private is switched to the new Pepper proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync. 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc
diff --git a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc
index d7faf83eb2fff2d2ec920970e15b957a9d52167f..ef5deccddf0c41cf9d76b7d6c69412414f6b4604 100644
--- a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc
+++ b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc
@@ -17,6 +17,7 @@ BrowserPpapiHost* BrowserPpapiHost::CreateExternalPluginProcess(
ppapi::PpapiPermissions permissions,
base::ProcessHandle plugin_child_process,
int plugin_child_process_id,
+ ProcessType plugin_child_process_type,
IPC::ChannelProxy* channel,
net::HostResolver* host_resolver,
int render_process_id,
@@ -28,11 +29,13 @@ BrowserPpapiHost* BrowserPpapiHost::CreateExternalPluginProcess(
FilePath profile_data_directory;
BrowserPpapiHostImpl* browser_ppapi_host =
new BrowserPpapiHostImpl(sender, permissions, plugin_name,
- profile_data_directory, plugin_child_process_id);
+ profile_data_directory,
+ plugin_child_process_id,
+ plugin_child_process_type);
browser_ppapi_host->set_plugin_process_handle(plugin_child_process);
channel->AddFilter(
- new PepperMessageFilter(PepperMessageFilter::NACL,
+ new PepperMessageFilter(plugin_child_process_type,
dmichael (off chromium) 2012/12/12 23:23:38 I'm not sure I understand why you are changing the
ygorshenin1 2012/12/18 12:07:16 Because there are different policies for nacl- and
dmichael (off chromium) 2012/12/22 00:35:08 But don't we only come in to this code path if the
ygorshenin1 2012/12/24 14:41:43 Because I don't understand why do we need PepperMe
dmichael (off chromium) 2013/01/10 05:57:16 I'm fine with using content::ProcessType. Makes se
ygorshenin1 2013/01/10 11:36:12 OK, agree. Done. On 2013/01/10 05:57:16, dmichael
permissions,
host_resolver,
render_process_id,
@@ -47,12 +50,14 @@ BrowserPpapiHostImpl::BrowserPpapiHostImpl(
const ppapi::PpapiPermissions& permissions,
const std::string& plugin_name,
const FilePath& profile_data_directory,
- int plugin_process_id)
+ int plugin_process_id,
+ ProcessType plugin_process_type)
: ppapi_host_(sender, permissions),
plugin_process_handle_(base::kNullProcessHandle),
plugin_name_(plugin_name),
profile_data_directory_(profile_data_directory),
- plugin_process_id_(plugin_process_id) {
+ plugin_process_id_(plugin_process_id),
+ plugin_process_type_(plugin_process_type) {
message_filter_ = new HostMessageFilter(&ppapi_host_);
ppapi_host_.AddHostFactoryFilter(scoped_ptr<ppapi::host::HostFactory>(
new ContentBrowserPepperHostFactory(this)));

Powered by Google App Engine
This is Rietveld 408576698