Make chrome.exe rendezvous with existing chrome process earlier.

chrome/app/chrome_exe_main_win.cc

Index: chrome/app/chrome_exe_main_win.cc
diff --git a/chrome/app/chrome_exe_main_win.cc b/chrome/app/chrome_exe_main_win.cc
index 237784d5649622f84f7821ae38db1fe21b19d090..abba67203ac620f89903635d8d8d9e30c77e158a 100644
--- a/chrome/app/chrome_exe_main_win.cc
+++ b/chrome/app/chrome_exe_main_win.cc
@@ -5,15 +5,24 @@
 #include <windows.h>
 #include <tchar.h>
 
+#include <string>
+
 #include "base/at_exit.h"
 #include "base/command_line.h"
+#include "base/files/file_path.h"
 #include "chrome/app/breakpad_win.h"
 #include "chrome/app/client_util.h"
 #include "chrome/app/metro_driver_win.h"
+#include "chrome/browser/chrome_process_finder_win.h"
+#include "chrome/browser/policy/policy_path_parser.h"
+#include "chrome/common/chrome_paths_internal.h"
+#include "chrome/common/chrome_switches.h"
 #include "content/public/app/startup_helper_win.h"
 #include "content/public/common/result_codes.h"
 #include "sandbox/win/src/sandbox_factory.h"
 
+namespace {
+
 int RunChrome(HINSTANCE instance) {
   bool exit_now = true;
   // We restarted because of a previous crash. Ask user if we should relaunch.
@@ -34,12 +43,61 @@ int RunChrome(HINSTANCE instance) {
   return rc;
 }
 
+// List of switches that it's safe to rendezvous early with. Fast start should
+// not be done if a command line contains a switch not in this set.
+// Note this is currently stored as a list of two because it's probably faster
+// to iterate over this small array than building a map for constant time
+// lookups.
+const char* const kFastStartSwitches[] = {
+  switches::kProfileDirectory,
+  switches::kShowAppList,
+};
+
+bool IsFastStartSwitch(const std::string& command_line_switch) {
+  for (size_t i = 0; i < arraysize(kFastStartSwitches); ++i) {
+    if (command_line_switch == kFastStartSwitches[i])
+      return true;
+  }
+  return false;
+}
+
+bool ContainsNonFastStartFlag(const CommandLine& command_line) {
+  const CommandLine::SwitchMap& switches = command_line.GetSwitches();
+  if (switches.size() > arraysize(kFastStartSwitches))
+    return true;
+  for (CommandLine::SwitchMap::const_iterator it = switches.begin();
+       it != switches.end(); ++it) {
+    if (!IsFastStartSwitch(it->first))
+      return true;
+  }
+  return false;
+}
+
+bool AttemptFastNotify(const CommandLine& command_line) {
+  if (ContainsNonFastStartFlag(command_line))
+    return false;
+
+  base::FilePath user_data_dir;
+  if (!chrome::GetDefaultUserDataDirectory(&user_data_dir))
+    return false;
+  policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
+
+  HWND chrome = chrome::FindRunningChromeWindow(user_data_dir);
+  return chrome &&
+      chrome::AttemptToNotifyRunningChrome(chrome) == chrome::NOTIFY_SUCCESS;
+}
+
+}  // namespace
+
 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prev, wchar_t*, int) {
   // Initialize the commandline singleton from the environment.
   CommandLine::Init(0, NULL);
   // The exit manager is in charge of calling the dtors of singletons.
   base::AtExitManager exit_manager;
 
+  if (AttemptFastNotify(*CommandLine::ForCurrentProcess()))
+    return 0;
+
   MetroDriver metro_driver;
   if (metro_driver.in_metro_mode())
     return metro_driver.RunInMetro(instance, &RunChrome);