diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-29 06:04:47 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-29 06:04:47 +0000 |
| commit | 7dee421c6babb91e637db6074774c8c6d0b67a56 (patch) | |
| tree | 065996c45c0903a694b8ec01c3168c752a1f7474 /chrome/browser/process_singleton.h | |
| parent | e001b82b7023f8b8a2dfec90e9615eb4bfdd374e (diff) | |
| download | chromium_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.h')
| -rw-r--r-- | chrome/browser/process_singleton.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h index 3ef620a..ed572fe 100644 --- a/chrome/browser/process_singleton.h +++ b/chrome/browser/process_singleton.h @@ -68,6 +68,12 @@ class ProcessSingleton : public NonThreadSafe { } private: +#if defined(OS_WIN) || defined(OS_LINUX) + // Timeout for the current browser process to respond. 20 seconds should be + // enough. It's only used in Windows and Linux implementations. + static const int kTimeoutInSeconds = 20; +#endif + bool locked_; gfx::NativeWindow foreground_window_; @@ -92,9 +98,6 @@ class ProcessSingleton : public NonThreadSafe { HWND remote_window_; // The HWND_MESSAGE of another browser. HWND window_; // The HWND_MESSAGE window. #elif defined(OS_LINUX) - // Set up a socket and sockaddr appropriate for messaging. - void SetupSocket(int* sock, struct sockaddr_un* addr); - // Path in file system to the socket. FilePath socket_path_; |