diff options
| author | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-09 19:52:16 +0000 |
|---|---|---|
| committer | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-09 19:52:16 +0000 |
| commit | 753efc479384c254e263fd11390846a060fa6ce0 (patch) | |
| tree | 488097f0622c5d744059f3c2ada4894b683c5305 /chrome/browser/process_singleton.h | |
| parent | 5e4d24d67febed160e2020f5c8f13d8073921fc4 (diff) | |
| download | chromium_src-753efc479384c254e263fd11390846a060fa6ce0.zip chromium_src-753efc479384c254e263fd11390846a060fa6ce0.tar.gz chromium_src-753efc479384c254e263fd11390846a060fa6ce0.tar.bz2 | |
BSD ifdefs, etc. necessary for chrome/
Review URL: http://codereview.chromium.org/656009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/process_singleton.h')
| -rw-r--r-- | chrome/browser/process_singleton.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h index 76c9c22..d182f45 100644 --- a/chrome/browser/process_singleton.h +++ b/chrome/browser/process_singleton.h @@ -52,7 +52,7 @@ class ProcessSingleton : public NonThreadSafe { // first one, so this function won't find it. NotifyResult NotifyOtherProcess(); -#if defined(OS_LINUX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) // Exposed for testing. We use a timeout on Linux, and in tests we want // this timeout to be short. NotifyResult NotifyOtherProcessWithTimeout(const CommandLine& command_line, @@ -87,7 +87,7 @@ class ProcessSingleton : public NonThreadSafe { } private: -#if defined(OS_WIN) || defined(OS_LINUX) +#if !defined(OS_MACOSX) // 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; @@ -116,7 +116,7 @@ class ProcessSingleton : public NonThreadSafe { HWND remote_window_; // The HWND_MESSAGE of another browser. HWND window_; // The HWND_MESSAGE window. -#elif defined(OS_LINUX) +#elif !defined(OS_MACOSX) // Path in file system to the socket. FilePath socket_path_; |