| Index: content/renderer/npapi/plugin_channel_host.cc
|
| diff --git a/content/renderer/npapi/plugin_channel_host.cc b/content/renderer/npapi/plugin_channel_host.cc
|
| index 3f9eaf905d96c36812b605af9501ac1071494f69..4e92f569f2c93fe1a68dbb55f019686adc1905af 100644
|
| --- a/content/renderer/npapi/plugin_channel_host.cc
|
| +++ b/content/renderer/npapi/plugin_channel_host.cc
|
| @@ -10,15 +10,12 @@
|
| #include "base/time/time.h"
|
| #include "build/build_config.h"
|
| #include "content/child/child_process.h"
|
| -#include "content/child/npapi/npobject_base.h"
|
| #include "content/child/plugin_messages.h"
|
|
|
| #if defined(OS_POSIX)
|
| #include "ipc/ipc_channel_posix.h"
|
| #endif
|
|
|
| -#include "third_party/WebKit/public/web/WebBindings.h"
|
| -
|
| // TODO(shess): Debugging for http://crbug.com/97285
|
| //
|
| // The hypothesis at #55 requires that RemoveRoute() be called between
|
| @@ -90,13 +87,9 @@ int PluginChannelHost::GenerateRouteID() {
|
| return route_id;
|
| }
|
|
|
| -void PluginChannelHost::AddRoute(int route_id,
|
| - IPC::Listener* listener,
|
| - NPObjectBase* npobject) {
|
| - NPChannelBase::AddRoute(route_id, listener, npobject);
|
| -
|
| - if (!npobject)
|
| - proxies_[route_id] = listener;
|
| +void PluginChannelHost::AddRoute(int route_id, IPC::Listener* listener) {
|
| + NPChannelBase::AddRoute(route_id, listener);
|
| + proxies_[route_id] = listener;
|
| }
|
|
|
| void PluginChannelHost::RemoveRoute(int route_id) {
|
| @@ -117,7 +110,6 @@ void PluginChannelHost::RemoveRoute(int route_id) {
|
| bool PluginChannelHost::OnControlMessageReceived(const IPC::Message& message) {
|
| bool handled = true;
|
| IPC_BEGIN_MESSAGE_MAP(PluginChannelHost, message)
|
| - IPC_MESSAGE_HANDLER(PluginHostMsg_SetException, OnSetException)
|
| IPC_MESSAGE_HANDLER(PluginHostMsg_PluginShuttingDown, OnPluginShuttingDown)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| @@ -125,10 +117,6 @@ bool PluginChannelHost::OnControlMessageReceived(const IPC::Message& message) {
|
| return handled;
|
| }
|
|
|
| -void PluginChannelHost::OnSetException(const std::string& message) {
|
| - blink::WebBindings::setException(NULL, message.c_str());
|
| -}
|
| -
|
| void PluginChannelHost::OnPluginShuttingDown() {
|
| expecting_shutdown_ = true;
|
| }
|
|
|