diff options
| author | cpu@google.com <cpu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 02:23:20 +0000 |
|---|---|---|
| committer | cpu@google.com <cpu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 02:23:20 +0000 |
| commit | 293c0a7b4306a4cce26eb31b21587206c2d9a497 (patch) | |
| tree | 4a1fe3db19d2db1051c062d2f15c789c4c7fa792 /chrome | |
| parent | 71e8a4492241d922f05a57cb86287f389277a243 (diff) | |
| download | chromium_src-293c0a7b4306a4cce26eb31b21587206c2d9a497.zip chromium_src-293c0a7b4306a4cce26eb31b21587206c2d9a497.tar.gz chromium_src-293c0a7b4306a4cce26eb31b21587206c2d9a497.tar.bz2 | |
HuntForZombieChromeProcesses() is killing the child process of upgrade
- remove call from MessageWindow::~MessageWindow()
- fix bug in zombie killer so it recognizes own childs
BUG=1323601
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser_init.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 30e8cb5..ff1fa47 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -107,7 +107,6 @@ BrowserInit::MessageWindow::MessageWindow(const std::wstring& user_data_dir) BrowserInit::MessageWindow::~MessageWindow() { if (window_) DestroyWindow(window_); - HuntForZombieChromeProcesses(); } bool BrowserInit::MessageWindow::NotifyOtherProcess(int show_cmd) { @@ -341,6 +340,8 @@ void BrowserInit::MessageWindow::HuntForZombieChromeProcesses() { if (process) browsers_.push_back(process); } + // We are also a browser, regardless of having the window or not. + browsers_.push_back(::GetCurrentProcessId()); } virtual bool Includes(uint32 pid, uint32 parent_pid) const { |