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

Unified Diff: chrome/browser/process_singleton.h

Issue 218883008: Use process_singleton_linux on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: CreateUniqueTempDir is fine. DCHECK socket path length. Created 6 years, 8 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
Index: chrome/browser/process_singleton.h
diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h
index 8fc9730f7e3ed9c82a3d83f1cf2403ffe1cd98b5..a58b676337d03ca00a9f49b1d3bd5f46adf697e6 100644
--- a/chrome/browser/process_singleton.h
+++ b/chrome/browser/process_singleton.h
@@ -24,7 +24,7 @@
#include "base/threading/non_thread_safe.h"
#include "ui/gfx/native_widget_types.h"
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_ANDROID)
#include "base/files/scoped_temp_dir.h"
#endif
@@ -89,7 +89,7 @@ class ProcessSingleton : public base::NonThreadSafe {
// Clear any lock state during shutdown.
void Cleanup();
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_ANDROID)
static void DisablePromptForTesting();
#endif
@@ -100,7 +100,7 @@ class ProcessSingleton : public base::NonThreadSafe {
// On Windows, Create() has to be called before this.
NotifyResult NotifyOtherProcess();
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_ANDROID)
// Exposed for testing. We use a timeout on Linux, and in tests we want
// this timeout to be short.
NotifyResult NotifyOtherProcessWithTimeout(
@@ -116,11 +116,9 @@ class ProcessSingleton : public base::NonThreadSafe {
#endif
private:
-#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.
+ // enough.
static const int kTimeoutInSeconds = 20;
-#endif
NotificationCallback notification_callback_; // Handler for notifications.
@@ -132,7 +130,7 @@ class ProcessSingleton : public base::NonThreadSafe {
bool is_virtualized_; // Stuck inside Microsoft Softricity VM environment.
HANDLE lock_file_;
base::FilePath user_data_dir_;
-#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#elif defined(OS_POSIX) && !defined(OS_ANDROID)
// Return true if the given pid is one of our child processes.
// Assumes that the current pid is the root of all pids of the current
// instance.
@@ -171,14 +169,6 @@ class ProcessSingleton : public base::NonThreadSafe {
// because it posts messages between threads.
class LinuxWatcher;
scoped_refptr<LinuxWatcher> watcher_;
-#elif defined(OS_MACOSX)
- // Path in file system to the lock.
- base::FilePath lock_path_;
-
- // File descriptor associated with the lockfile, valid between
- // |Create()| and |Cleanup()|. Two instances cannot have a lock on
- // the same file at the same time.
- int lock_fd_;
#endif
DISALLOW_COPY_AND_ASSIGN(ProcessSingleton);

Powered by Google App Engine
This is Rietveld 408576698