| Index: chrome/browser/renderer_host/resource_message_filter.cc
|
| ===================================================================
|
| --- chrome/browser/renderer_host/resource_message_filter.cc (revision 65099)
|
| +++ chrome/browser/renderer_host/resource_message_filter.cc (working copy)
|
| @@ -38,10 +38,11 @@
|
| #include "chrome/browser/notifications/desktop_notification_service.h"
|
| #include "chrome/browser/notifications/notifications_prefs_cache.h"
|
| #include "chrome/browser/platform_util.h"
|
| +#include "chrome/browser/plugin_process_host.h"
|
| #include "chrome/browser/plugin_service.h"
|
| -#include "chrome/browser/plugin_process_host.h"
|
| +#include "chrome/browser/ppapi_plugin_process_host.h"
|
| +#include "chrome/browser/printing/print_job_manager.h"
|
| #include "chrome/browser/printing/printer_query.h"
|
| -#include "chrome/browser/printing/print_job_manager.h"
|
| #include "chrome/browser/profile.h"
|
| #include "chrome/browser/renderer_host/audio_renderer_host.h"
|
| #include "chrome/browser/renderer_host/blob_dispatcher_host.h"
|
| @@ -450,6 +451,8 @@
|
| OnReceiveContextMenuMsg(msg))
|
| IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_OpenChannelToPlugin,
|
| OnOpenChannelToPlugin)
|
| + IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_OpenChannelToPepperPlugin,
|
| + OnOpenChannelToPepperPlugin)
|
| IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_LaunchNaCl, OnLaunchNaCl)
|
| IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWorker, OnCreateWorker)
|
| IPC_MESSAGE_HANDLER(ViewHostMsg_LookupSharedWorker, OnLookupSharedWorker)
|
| @@ -877,6 +880,14 @@
|
| new OpenChannelToPluginCallback(this, reply_msg));
|
| }
|
|
|
| +void ResourceMessageFilter::OnOpenChannelToPepperPlugin(
|
| + const FilePath& path,
|
| + IPC::Message* reply_msg) {
|
| + PpapiPluginProcessHost* host = new PpapiPluginProcessHost(this);
|
| + host->Init(path, reply_msg);
|
| + ppapi_plugin_hosts_.push_back(linked_ptr<PpapiPluginProcessHost>(host));
|
| +}
|
| +
|
| void ResourceMessageFilter::OnLaunchNaCl(
|
| const std::wstring& url, int channel_descriptor, IPC::Message* reply_msg) {
|
| NaClProcessHost* host = new NaClProcessHost(resource_dispatcher_host_, url);
|
|
|