From 4d5495a0a0460eb6838031a39b9ee958e13b30cf Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Mon, 19 Oct 2015 14:50:18 -0700
Subject: [PATCH] Bring in chrome_process_singleton but nuke the active dialog
 bits

---
 atom/browser/atom_process_singleton.cc | 29 ++++++++++++++
 atom/browser/atom_process_singleton.h  | 52 ++++++++++++++++++++++++++
 filenames.gypi                         |  1 +
 3 files changed, 82 insertions(+)
 create mode 100644 atom/browser/atom_process_singleton.cc
 create mode 100644 atom/browser/atom_process_singleton.h

diff --git a/atom/browser/atom_process_singleton.cc b/atom/browser/atom_process_singleton.cc
new file mode 100644
index 000000000000..e9e4dc727bf7
--- /dev/null
+++ b/atom/browser/atom_process_singleton.cc
@@ -0,0 +1,29 @@
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/atom_process_singleton.h"
+
+AtomProcessSingleton::AtomProcessSingleton(
+    const base::FilePath& user_data_dir,
+    const ProcessSingleton::NotificationCallback& notification_callback)
+    : startup_lock_(notification_callback),
+      process_singleton_(user_data_dir,
+                         startup_lock_.AsNotificationCallback()) {
+}
+
+AtomProcessSingleton::~AtomProcessSingleton() {
+}
+
+ProcessSingleton::NotifyResult
+    AtomProcessSingleton::NotifyOtherProcessOrCreate() {
+  return process_singleton_.NotifyOtherProcessOrCreate();
+}
+
+void AtomProcessSingleton::Cleanup() {
+  process_singleton_.Cleanup();
+}
+
+void AtomProcessSingleton::Unlock() {
+  startup_lock_.Unlock();
+}
diff --git a/atom/browser/atom_process_singleton.h b/atom/browser/atom_process_singleton.h
new file mode 100644
index 000000000000..de4e2463a080
--- /dev/null
+++ b/atom/browser/atom_process_singleton.h
@@ -0,0 +1,52 @@
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_BROWSER_ATOM_PROCESS_SINGLETON_H_
+#define ATOM_BROWSER_ATOM_PROCESS_SINGLETON_H_
+
+#include "base/basictypes.h"
+#include "base/files/file_path.h"
+#include "atom/browser/process_singleton.h"
+#include "atom/browser/process_singleton_startup_lock.h"
+
+// Composes a basic ProcessSingleton with ProcessSingletonStartupLock
+class AtomProcessSingleton {
+ public:
+  AtomProcessSingleton(
+      const base::FilePath& user_data_dir,
+      const ProcessSingleton::NotificationCallback& notification_callback);
+      
+  ~AtomProcessSingleton();
+
+  // Notify another process, if available. Otherwise sets ourselves as the
+  // singleton instance. Returns PROCESS_NONE if we became the singleton
+  // instance. Callers are guaranteed to either have notified an existing
+  // process or have grabbed the singleton (unless the profile is locked by an
+  // unreachable process).
+  ProcessSingleton::NotifyResult NotifyOtherProcessOrCreate();
+
+  // Clear any lock state during shutdown.
+  void Cleanup();
+
+  // Executes previously queued command-line invocations and allows future
+  // invocations to be executed immediately.
+  // This only has an effect the first time it is called.
+  void Unlock();
+
+ private:
+  // We compose these two locks with the client-supplied notification callback.
+  // First |modal_dialog_lock_| will discard any notifications that arrive while
+  // a modal dialog is active. Otherwise, it will pass the notification to
+  // |startup_lock_|, which will queue notifications until |Unlock()| is called.
+  // Notifications passing through both locks are finally delivered to our
+  // client.
+  ProcessSingletonStartupLock startup_lock_;
+
+  // The basic ProcessSingleton
+  ProcessSingleton process_singleton_;
+
+  DISALLOW_COPY_AND_ASSIGN(AtomProcessSingleton);
+};
+
+#endif  // ATOM_BROWSER_ATOM_PROCESS_SINGLETON_H_
diff --git a/filenames.gypi b/filenames.gypi
index 0dce079b5ec6..54fedb9f4130 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -129,6 +129,7 @@
       'atom/browser/atom_browser_main_parts_mac.mm',
       'atom/browser/atom_browser_main_parts_posix.cc',
       'atom/browser/atom_process_finder_win.cc',
+      'atom/browser/atom_process_singleton.cc',
       'atom/browser/atom_javascript_dialog_manager.cc',
       'atom/browser/atom_javascript_dialog_manager.h',
       'atom/browser/atom_quota_permission_context.cc',