Index: content/browser/renderer_host/render_message_filter.cc |
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc |
index 0823310897e723e7b076dd8c4b8d6ebaa3a5df2b..f6493bb52c17e3da6ba947f8711f1519dd16d78a 100644 |
--- a/content/browser/renderer_host/render_message_filter.cc |
+++ b/content/browser/renderer_host/render_message_filter.cc |
@@ -329,6 +329,7 @@ RenderMessageFilter::~RenderMessageFilter() { |
void RenderMessageFilter::OnChannelClosing() { |
BrowserMessageFilter::OnChannelClosing(); |
+#if defined(ENABLE_PLUGINS) |
for (std::set<OpenChannelToNpapiPluginCallback*>::iterator it = |
plugin_host_clients_.begin(); it != plugin_host_clients_.end(); ++it) { |
OpenChannelToNpapiPluginCallback* client = *it; |
@@ -343,6 +344,7 @@ void RenderMessageFilter::OnChannelClosing() { |
} |
client->Cancel(); |
} |
+#endif // defined(ENABLE_PLUGINS) |
plugin_host_clients_.clear(); |
} |
@@ -380,12 +382,12 @@ bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message, |
#if defined(OS_MACOSX) |
IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_LoadFont, OnLoadFont) |
#endif |
+ IPC_MESSAGE_HANDLER(ViewHostMsg_DownloadUrl, OnDownloadUrl) |
+#if defined(ENABLE_PLUGINS) |
IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_GetPlugins, OnGetPlugins) |
IPC_MESSAGE_HANDLER(ViewHostMsg_GetPluginInfo, OnGetPluginInfo) |
- IPC_MESSAGE_HANDLER(ViewHostMsg_DownloadUrl, OnDownloadUrl) |
IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_OpenChannelToPlugin, |
OnOpenChannelToPlugin) |
-#if defined(ENABLE_PLUGINS) |
IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_OpenChannelToPepperPlugin, |
OnOpenChannelToPepperPlugin) |
IPC_MESSAGE_HANDLER(ViewHostMsg_DidCreateOutOfProcessPepperInstance, |