summaryrefslogtreecommitdiffstats
path: root/content/browser/plugin_data_remover_impl.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-13 19:49:29 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-13 19:49:29 +0000
commit8be45847f76ec798c1241ed7e98cfb19f68b7e96 (patch)
tree7198fc01d68a1a5f4110c3167635f2000444054c /content/browser/plugin_data_remover_impl.cc
parent43095f23d76d2ae3d50e1e8bb55c71152025d76c (diff)
downloadchromium_src-8be45847f76ec798c1241ed7e98cfb19f68b7e96.zip
chromium_src-8be45847f76ec798c1241ed7e98cfb19f68b7e96.tar.gz
chromium_src-8be45847f76ec798c1241ed7e98cfb19f68b7e96.tar.bz2
This adds a hang monitor for Pepper plugins. It monitors sync messages on the I/O thread of the renderer and sends a message to the browser if it's blocked for too long.
The browser will show an infobar allowing you to terminate the plugin. BUG=122795 Review URL: https://chromiumcodereview.appspot.com/10014013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_data_remover_impl.cc')
-rw-r--r--content/browser/plugin_data_remover_impl.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/content/browser/plugin_data_remover_impl.cc b/content/browser/plugin_data_remover_impl.cc
index 0d83135..fd62447 100644
--- a/content/browser/plugin_data_remover_impl.cc
+++ b/content/browser/plugin_data_remover_impl.cc
@@ -168,7 +168,8 @@ class PluginDataRemoverImpl::Context
virtual void OnPpapiChannelOpened(
base::ProcessHandle plugin_process_handle,
- const IPC::ChannelHandle& channel_handle) OVERRIDE {
+ const IPC::ChannelHandle& channel_handle,
+ int /* child_id */) OVERRIDE {
if (plugin_process_handle != base::kNullProcessHandle)
ConnectToChannel(channel_handle, true);