diff options
| author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-08 07:56:39 +0000 |
|---|---|---|
| committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-08 07:56:39 +0000 |
| commit | aa2da5a192e30c5e2c7583597e86adac4d11d14b (patch) | |
| tree | fa2eb94672c2e161379ff1c357c7dece379587e7 /chrome/browser/plugin_process_host.cc | |
| parent | eb2b2d8b73dfcbe5463f180e97a4fe841ca6e440 (diff) | |
| download | chromium_src-aa2da5a192e30c5e2c7583597e86adac4d11d14b.zip chromium_src-aa2da5a192e30c5e2c7583597e86adac4d11d14b.tar.gz chromium_src-aa2da5a192e30c5e2c7583597e86adac4d11d14b.tar.bz2 | |
Third times a charm! This is an attempt at re-landing r408. This time the UI test is revised to give the browser a chance to notice a crashed tab.
TBR=nsylvain
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@557 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_process_host.cc')
| -rw-r--r-- | chrome/browser/plugin_process_host.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc index 7ee3015..f64af9d 100644 --- a/chrome/browser/plugin_process_host.cc +++ b/chrome/browser/plugin_process_host.cc @@ -329,7 +329,7 @@ PluginProcessHost::PluginProcessHost(PluginService* plugin_service) PluginProcessHost::~PluginProcessHost() { if (process_.handle()) { - MessageLoop::current()->WatchObject(process_.handle(), NULL); + watcher_.StopWatching(); ProcessWatcher::EnsureProcessTerminated(process_.handle()); } } @@ -461,7 +461,7 @@ bool PluginProcessHost::Init(const std::wstring& dll, process_.set_handle(process); } - MessageLoop::current()->WatchObject(process_.handle(), this); + watcher_.StartWatching(process_.handle(), this); // Give all plugins "background" priority. See http://b/issue?id=1280317. process_.SetProcessBackgrounded(true); |