summaryrefslogtreecommitdiffstats
path: root/chrome/browser/process_singleton_win.cc
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-29 06:04:47 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-29 06:04:47 +0000
commit7dee421c6babb91e637db6074774c8c6d0b67a56 (patch)
tree065996c45c0903a694b8ec01c3168c752a1f7474 /chrome/browser/process_singleton_win.cc
parente001b82b7023f8b8a2dfec90e9615eb4bfdd374e (diff)
downloadchromium_src-7dee421c6babb91e637db6074774c8c6d0b67a56.zip
chromium_src-7dee421c6babb91e637db6074774c8c6d0b67a56.tar.gz
chromium_src-7dee421c6babb91e637db6074774c8c6d0b67a56.tar.bz2
Linux: Adds ACKs to ProcessSingletonLinux.
Patch contributed by suzhe@google.com (http://codereview.chromium.org/155772) BUG=http://crbug.com/12343 TEST=In one terminal, launch chrome and stop the process by pressing ctrl-z, then launch chrome again in another terminal. The second chrome shall be started in 5 seconds, and the first one shall be killed. Review URL: http://codereview.chromium.org/159577 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21943 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/process_singleton_win.cc')
-rw-r--r--chrome/browser/process_singleton_win.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
index a02becc..74e1d51 100644
--- a/chrome/browser/process_singleton_win.cc
+++ b/chrome/browser/process_singleton_win.cc
@@ -78,8 +78,6 @@ bool ProcessSingleton::NotifyOtherProcess() {
AllowSetForegroundWindow(process_id);
- // Gives 20 seconds timeout for the current browser process to respond.
- const int kTimeout = 20000;
COPYDATASTRUCT cds;
cds.dwData = 0;
cds.cbData = static_cast<DWORD>((to_send.length() + 1) * sizeof(wchar_t));
@@ -90,7 +88,7 @@ bool ProcessSingleton::NotifyOtherProcess() {
NULL,
reinterpret_cast<LPARAM>(&cds),
SMTO_ABORTIFHUNG,
- kTimeout,
+ kTimeoutInSeconds * 1000,
&result)) {
// It is possible that the process owning this window may have died by now.
if (!result) {