diff options
| author | nsylvain@google.com <nsylvain@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 17:48:24 +0000 |
|---|---|---|
| committer | nsylvain@google.com <nsylvain@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 17:48:24 +0000 |
| commit | 93b6b46b7d5ff9429135c00fd9d97be71c49d166 (patch) | |
| tree | 30af75c78c734104defdb7a5d15701c8ff146741 /chrome/browser/plugin_process_host.cc | |
| parent | dd88bf243bf1ddc01f16fdce388d5a9718240dea (diff) | |
| download | chromium_src-93b6b46b7d5ff9429135c00fd9d97be71c49d166.zip chromium_src-93b6b46b7d5ff9429135c00fd9d97be71c49d166.tar.gz chromium_src-93b6b46b7d5ff9429135c00fd9d97be71c49d166.tar.bz2 | |
Revert change 408 to see if it fixes the ui tests.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@438 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); |