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

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

Issue 10821062: Fix CleanupProcesses() interface to use TimeDelta. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 months 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 | « base/process_util_win.cc ('k') | chrome/test/mini_installer_test/installer_test_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/uninstall.cc
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 788d7936e3959f9b1132f864baf6960dc28c34b7..51b9717bcacda0bf8554dbbf2205172b18f0f84b 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -187,9 +187,9 @@ void CloseAllChromeProcesses() {
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, 0,
+ base::CleanupProcesses(installer::kChromeExe, base::TimeDelta(),
content::RESULT_CODE_HUNG, NULL);
- base::CleanupProcesses(installer::kNaClExe, 0,
+ base::CleanupProcesses(installer::kNaClExe, base::TimeDelta(),
content::RESULT_CODE_HUNG, NULL);
return;
}
@@ -199,9 +199,11 @@ void CloseAllChromeProcesses() {
// 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, 15000,
+ base::CleanupProcesses(installer::kChromeExe,
+ base::TimeDelta::FromSeconds(15),
content::RESULT_CODE_HUNG, NULL);
- base::CleanupProcesses(installer::kNaClExe, 15000,
+ base::CleanupProcesses(installer::kNaClExe,
+ base::TimeDelta::FromSeconds(15),
content::RESULT_CODE_HUNG, NULL);
}
@@ -236,7 +238,7 @@ void CloseChromeFrameHelperProcess() {
if (kill) {
VLOG(1) << installer::kChromeFrameHelperExe << " hung. Killing.";
- base::CleanupProcesses(installer::kChromeFrameHelperExe, 0,
+ base::CleanupProcesses(installer::kChromeFrameHelperExe, base::TimeDelta(),
content::RESULT_CODE_HUNG, NULL);
}
}
« no previous file with comments | « base/process_util_win.cc ('k') | chrome/test/mini_installer_test/installer_test_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698