diff options
| author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-07 07:24:18 +0000 |
|---|---|---|
| committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-07 07:24:18 +0000 |
| commit | a346e5d85135c9c5261ad33a20293bf10ca74468 (patch) | |
| tree | a91d386790b2812936b4b618165b4e411172f095 /chrome/browser/plugin_process_host.cc | |
| parent | b9c3a91b0340151f21e3708b8187f295e6cf8cfd (diff) | |
| download | chromium_src-a346e5d85135c9c5261ad33a20293bf10ca74468.zip chromium_src-a346e5d85135c9c5261ad33a20293bf10ca74468.tar.gz chromium_src-a346e5d85135c9c5261ad33a20293bf10ca74468.tar.bz2 | |
rollback r498 and r500 to repair test bustage
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@503 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 f64af9d..7ee3015 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()) { - watcher_.StopWatching(); + MessageLoop::current()->WatchObject(process_.handle(), NULL); ProcessWatcher::EnsureProcessTerminated(process_.handle()); } } @@ -461,7 +461,7 @@ bool PluginProcessHost::Init(const std::wstring& dll, process_.set_handle(process); } - watcher_.StartWatching(process_.handle(), this); + MessageLoop::current()->WatchObject(process_.handle(), this); // Give all plugins "background" priority. See http://b/issue?id=1280317. process_.SetProcessBackgrounded(true); |