Make browser aware of other instances. Part of both nwjs#61 and nwjs#64.

zcbenz · zcbenz · commit fde26ec6a08e · 2012-11-05T13:57:38.000+08:00
Relying on chrohime/build_chromium@e39ee1a.
diff --git a/nw.gypi b/nw.gypi
@@ -50,18 +50,26 @@
         '<(DEPTH)/chrome/browser/platform_util_mac.mm',
         '<(DEPTH)/chrome/browser/platform_util_win.cc',
         '<(DEPTH)/chrome/browser/platform_util.h',
+        '<(DEPTH)/chrome/browser/process_singleton_linux.cc',
+        '<(DEPTH)/chrome/browser/process_singleton_mac.cc',
+        '<(DEPTH)/chrome/browser/process_singleton_win.cc',
+        '<(DEPTH)/chrome/browser/process_singleton.h',
         '<(DEPTH)/chrome/browser/status_icons/status_icon.cc',
         '<(DEPTH)/chrome/browser/status_icons/status_icon.h',
         '<(DEPTH)/chrome/browser/status_icons/status_icon_observer.h',
         '<(DEPTH)/chrome/browser/status_icons/status_tray.cc',
         '<(DEPTH)/chrome/browser/status_icons/status_tray.h',
         '<(DEPTH)/chrome/browser/ui/base_window.h',
-        '<(DEPTH)/chrome/browser/ui/gtk/gtk_window_util.h',
         '<(DEPTH)/chrome/browser/ui/gtk/gtk_window_util.cc',
+        '<(DEPTH)/chrome/browser/ui/gtk/gtk_window_util.h',
         '<(DEPTH)/chrome/browser/ui/views/status_icons/status_icon_win.cc',
         '<(DEPTH)/chrome/browser/ui/views/status_icons/status_icon_win.h',
         '<(DEPTH)/chrome/browser/ui/views/status_icons/status_tray_win.cc',
         '<(DEPTH)/chrome/browser/ui/views/status_icons/status_tray_win.h',
+        '<(DEPTH)/chrome/common/chrome_constants.cc',
+        '<(DEPTH)/chrome/common/chrome_constants.h',
+        '<(DEPTH)/chrome/common/chrome_switches.cc',
+        '<(DEPTH)/chrome/common/chrome_switches.h',
         '<(DEPTH)/chrome/common/extensions/draggable_region.cc',
         '<(DEPTH)/chrome/common/extensions/draggable_region.h',
         '<(DEPTH)/chrome/common/zip.cc',
diff --git a/src/shell_browser_main_parts.cc b/src/shell_browser_main_parts.cc
@@ -20,6 +20,7 @@
 
 #include "content/nw/src/shell_browser_main_parts.h"
 
+#include "base/bind.h"
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread_restrictions.h"
@@ -95,6 +96,15 @@ void ShellBrowserMainParts::Init() {
   off_the_record_browser_context_.reset(
       new ShellBrowserContext(true, package()));
 
+  // OS X automatically handles multi process issue for us, so we don't need
+  // to check for other instances of node-webkit on Mac.
+#if !defined(MAC_OSX)
+  process_singleton_.reset(new ProcessSingleton(browser_context_->GetPath()));
+  process_singleton_->NotifyOtherProcessOrCreate(
+      base::Bind(&ShellBrowserMainParts::ProcessSingletonNotificationCallback,
+                 base::Unretained(this)));
+#endif
+
   net::NetModule::SetResourceProvider(PlatformResourceProvider);
 
   int port = 0;
@@ -121,4 +131,11 @@ void ShellBrowserMainParts::Init() {
                 NULL);
 }
 
+bool ShellBrowserMainParts::ProcessSingletonNotificationCallback(
+    const CommandLine& command_line,
+    const FilePath& current_directory) {
+  LOG(ERROR) << "ProcessSingletonNotificationCallback";
+  return false;
+}
+
 }  // namespace content
diff --git a/src/shell_browser_main_parts.h b/src/shell_browser_main_parts.h
@@ -7,6 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/browser/process_singleton.h"
 #include "content/public/browser/browser_main_parts.h"
 
 namespace base {
@@ -17,6 +18,9 @@ namespace nw {
 class Package;
 }
 
+class CommandLine;
+class FilePath;
+
 namespace content {
 
 class ShellBrowserContext;
@@ -46,10 +50,15 @@ class ShellBrowserMainParts : public BrowserMainParts {
   nw::Package* package() { return package_.get(); }
 
  private:
+  bool ProcessSingletonNotificationCallback(const CommandLine& command_line,
+                                            const FilePath& current_directory);
+
   scoped_ptr<ShellBrowserContext> browser_context_;
   scoped_ptr<ShellBrowserContext> off_the_record_browser_context_;
   scoped_ptr<nw::Package> package_;
 
+  scoped_ptr<ProcessSingleton> process_singleton_;
+
   // For running content_browsertests.
   const MainFunctionParams& parameters_;
   bool run_message_loop_;
