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 1c982f0ee74691b364000ccd91b7bf2c00ceb21c..2b25495d6a41f15a5484a8e75cab3227ec50875d 100644 |
--- a/content/browser/renderer_host/render_message_filter.cc |
+++ b/content/browser/renderer_host/render_message_filter.cc |
@@ -219,6 +219,7 @@ class OpenChannelToPpapiBrokerCallback |
} // namespace |
+#if defined(ENABLE_PLUGINS) |
Lei Zhang
2014/10/30 21:48:54
ENABLE_PLUGINS is for PPAPI only. All the NPAPI co
tommycli
2014/10/30 22:37:21
Done.
|
class RenderMessageFilter::OpenChannelToNpapiPluginCallback |
: public RenderMessageCompletionCallback, |
public PluginProcessHost::Client { |
@@ -292,6 +293,7 @@ class RenderMessageFilter::OpenChannelToNpapiPluginCallback |
PluginProcessHost* host_; |
bool sent_plugin_channel_request_; |
}; |
+#endif // defined(ENABLE_PLUGINS) |
RenderMessageFilter::RenderMessageFilter( |
int render_process_id, |
@@ -324,7 +326,9 @@ RenderMessageFilter::RenderMessageFilter( |
RenderMessageFilter::~RenderMessageFilter() { |
// This function should be called on the IO thread. |
DCHECK_CURRENTLY_ON(BrowserThread::IO); |
+#if defined(ENABLE_PLUGINS) |
DCHECK(plugin_host_clients_.empty()); |
+#endif |
HostSharedBitmapManager::current()->ProcessRemoved(PeerHandle()); |
BrowserGpuMemoryBufferManager::current()->ProcessRemoved(PeerHandle()); |
HostDiscardableSharedMemoryManager::current()->ProcessRemoved(PeerHandle()); |
@@ -346,8 +350,8 @@ void RenderMessageFilter::OnChannelClosing() { |
} |
client->Cancel(); |
} |
-#endif // defined(ENABLE_PLUGINS) |
plugin_host_clients_.clear(); |
+#endif // defined(ENABLE_PLUGINS) |
} |
bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message) { |
@@ -1122,12 +1126,14 @@ void RenderMessageFilter::SendGetRawCookiesResponse( |
Send(reply_msg); |
} |
+#if defined(ENABLE_PLUGINS) |
void RenderMessageFilter::OnCompletedOpenChannelToNpapiPlugin( |
OpenChannelToNpapiPluginCallback* client) { |
DCHECK_CURRENTLY_ON(BrowserThread::IO); |
DCHECK(ContainsKey(plugin_host_clients_, client)); |
plugin_host_clients_.erase(client); |
} |
+#endif |
void RenderMessageFilter::OnAre3DAPIsBlocked(int render_view_id, |
const GURL& top_origin_url, |