Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6566)

Unified Diff: chrome/installer/setup/uninstall.cc

Issue 11348236: Merge 169130 - Remove self-destruct message box (causing hang in Metro). (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1312/src/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chrome_browser_main_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/uninstall.cc
===================================================================
--- chrome/installer/setup/uninstall.cc (revision 169532)
+++ chrome/installer/setup/uninstall.cc (working copy)
@@ -185,38 +185,11 @@
namespace installer {
-// This functions checks for any Chrome instances that are
-// running and first asks them to close politely by sending a Windows message.
-// If there is an error while sending message or if there are still Chrome
-// procesess active after the message has been sent, this function will try
-// to kill them.
+// Kills all Chrome processes, immediately.
void CloseAllChromeProcesses() {
- for (int j = 0; j < 4; ++j) {
- string16 wnd_class(L"Chrome_WidgetWin_");
- wnd_class.append(base::IntToString16(j));
- HWND window = FindWindowEx(NULL, NULL, wnd_class.c_str(), NULL);
- while (window) {
- HWND tmpWnd = window;
- window = FindWindowEx(NULL, window, wnd_class.c_str(), NULL);
- if (!SendMessageTimeout(tmpWnd, WM_CLOSE, 0, 0, SMTO_BLOCK, 3000, NULL) &&
- (GetLastError() == ERROR_TIMEOUT)) {
- base::CleanupProcesses(installer::kChromeExe, base::TimeDelta(),
- content::RESULT_CODE_HUNG, NULL);
- base::CleanupProcesses(installer::kNaClExe, base::TimeDelta(),
- content::RESULT_CODE_HUNG, NULL);
- return;
- }
- }
- }
-
- // If asking politely didn't work, wait for 15 seconds and then kill all
- // chrome.exe. This check is just in case Chrome is ignoring WM_CLOSE
- // messages.
- base::CleanupProcesses(installer::kChromeExe,
- base::TimeDelta::FromSeconds(15),
+ base::CleanupProcesses(installer::kChromeExe, base::TimeDelta(),
content::RESULT_CODE_HUNG, NULL);
- base::CleanupProcesses(installer::kNaClExe,
- base::TimeDelta::FromSeconds(15),
+ base::CleanupProcesses(installer::kNaClExe, base::TimeDelta(),
content::RESULT_CODE_HUNG, NULL);
}
« no previous file with comments | « chrome/browser/chrome_browser_main_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698