Fix relaunches on the Mac

chrome/app/chrome_main.cc

 // Copyright (c) 2011 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 "chrome/app/chrome_main.h"
 
 #include "app/app_paths.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
@@ skipping 45 matching lines @@
 #include "base/win/registry.h"
 #include "sandbox/src/sandbox.h"
 #include "tools/memory_watcher/memory_watcher.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "base/mac/os_crash_dumps.h"
 #include "base/mach_ipc_mac.h"
 #include "chrome/app/breakpad_mac.h"
+#include "chrome/browser/mac/relauncher.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "content/browser/mach_broker_mac.h"
 #include "grit/chromium_strings.h"
 #include "third_party/WebKit/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #endif
 
 #if defined(OS_POSIX)
 #include <locale.h>
 #include <signal.h>
@@ skipping 222 matching lines @@
       // The zygote process opens the resources for the renderers.
       process_type == switches::kZygoteProcess ||
 #endif
       process_type == switches::kRendererProcess ||
       process_type == switches::kExtensionProcess ||
       process_type == switches::kUtilityProcess;
 }
 
 // Returns true if this process is a child of the browser process.
 bool SubprocessIsBrowserChild(const std::string& process_type) {
-  if (process_type.empty() || process_type == switches::kServiceProcess) {
+  if (process_type.empty() ||
+#if defined(OS_MACOSX)
+      process_type == switches::kRelauncherProcess ||
+#endif
+      process_type == switches::kServiceProcess) {
     return false;
   }
   return true;
 }
 
 #if defined(OS_MACOSX)
 // Update the name shown in Activity Monitor so users are less likely to ask
 // why Chrome has so many processes.
 void SetMacProcessName(const std::string& process_type) {
   // Don't worry about the browser process, its gets the stock name.
@@ skipping 182 matching lines @@
     { switches::kWorkerProcess,      WorkerMain },
     { switches::kPpapiPluginProcess, PpapiPluginMain },
     { switches::kPpapiBrokerProcess, PpapiBrokerMain },
     { switches::kUtilityProcess,     UtilityMain },
     { switches::kGpuProcess,         GpuMain },
     { switches::kServiceProcess,     ServiceProcessMain },
 
 #if defined(OS_MACOSX)
     // TODO(port): Use OOP profile import - http://crbug.com/22142 .
     { switches::kProfileImportProcess, ProfileImportMain },
+    { switches::kRelauncherProcess,  mac_relauncher::internal::RelauncherMain },
 #endif
 #if !defined(DISABLE_NACL)
     { switches::kNaClLoaderProcess, NaClMain },
 #ifdef _WIN64  // The broker process is used only on Win64.
     { switches::kNaClBrokerProcess, NaClBrokerMain },
 #endif
 #endif  // DISABLE_NACL
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
     // Zygote startup is special -- see RunZygote comments above
     // for why we don't use ZygoteMain directly.
@@ skipping 85 matching lines @@
     browser_pid = static_cast<base::ProcessId>(browser_pid_int);
     DCHECK_NE(browser_pid_int, 0);
 #elif defined(OS_POSIX)
     // On linux, we're in the zygote here; so we need the parent process' id.
     browser_pid = base::GetParentProcessId(base::GetCurrentProcId());
 #endif
 
 #if defined(OS_MACOSX)
     SendTaskPortToParentProcess();
 #endif
+  }
 
 #if defined(OS_POSIX)
+  if (!process_type.empty()) {
     // When you hit Ctrl-C in a terminal running the browser
     // process, a SIGINT is delivered to the entire process group.
     // When debugging the browser process via gdb, gdb catches the
     // SIGINT for the browser process (and dumps you back to the gdb
     // console) but doesn't for the child processes, killing them.
     // The fix is to have child processes ignore SIGINT; they'll die
     // on their own when the browser process goes away.
     //
     // Note that we *can't* rely on BeingDebugged to catch this case because we
     // are the child process, which is not being debugged.
     // TODO(evanm): move this to some shared subprocess-init function.
     if (!base::debug::BeingDebugged())
       signal(SIGINT, SIG_IGN);
+  }
 #endif
-  }
+
   SetupCRT(command_line);
 
 #if defined(USE_NSS)
   crypto::EarlySetupForNSSInit();
 #endif
 
   // Initialize the Chrome path provider.
   app::RegisterPathProvider();
   ui::RegisterPathProvider();
   chrome::RegisterPathProvider();
@@ skipping 204 matching lines @@
 
   if (SubprocessNeedsResourceBundle(process_type))
     ResourceBundle::CleanupSharedInstance();
 
   logging::CleanupChromeLogging();
 
   chrome_main::LowLevelShutdown();
 
   return exit_code;
 }