Index: chrome/browser/nacl_host/nacl_process_host.cc |
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc |
index 748506c30849384334c14e4fbb5b87653a44889f..863fd9aa8a83cfbc7a5d5ece0f151bea5bce0e1d 100644 |
--- a/chrome/browser/nacl_host/nacl_process_host.cc |
+++ b/chrome/browser/nacl_host/nacl_process_host.cc |
@@ -37,6 +37,7 @@ |
#include "content/public/browser/child_process_data.h" |
#include "content/public/browser/pepper_helper.h" |
#include "content/public/common/child_process_host.h" |
+#include "content/public/common/pepper_permissions_config.h" |
#include "ipc/ipc_channel.h" |
#include "ipc/ipc_switches.h" |
#include "native_client/src/shared/imc/nacl_imc.h" |
@@ -131,8 +132,11 @@ bool NaClProcessHost::PluginListener::OnMessageReceived( |
return host_->OnUntrustedMessageForwarded(msg); |
} |
+// TODO(brettw) bug 153036 set the pepper permissions up for dev interfaces. |
NaClProcessHost::NaClProcessHost(const GURL& manifest_url, bool off_the_record) |
: manifest_url_(manifest_url), |
+ permissions_(content::AddPepperPermissionsFromCommandLine( |
+ ppapi::PpapiPermissions())), |
#if defined(OS_WIN) |
process_launched_by_broker_(false), |
#elif defined(OS_LINUX) |
@@ -758,6 +762,7 @@ void NaClProcessHost::OnPpapiChannelCreated( |
ipc_proxy_channel_->Send( |
new PpapiMsg_CreateNaClChannel( |
chrome_render_message_filter_->render_process_id(), |
+ permissions_, |
chrome_render_message_filter_->off_the_record(), |
SerializedHandle(SerializedHandle::CHANNEL_HANDLE, |
IPC::InvalidPlatformFileForTransit()))); |