Improve the UI for handling profile lock contention.

chrome/browser/process_singleton_linux.cc

 // Copyright (c) 2012 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.
 
 // On Linux, when the user tries to launch a second copy of chrome, we check
 // for a socket in the user's profile directory.  If the socket file is open we
 // send a message to the first chrome browser process with the current
 // directory and second process command line flags.  The second process then
 // exits.
 //
@@ skipping 276 matching lines @@
 
   *hostname = real_path.substr(0, pos);
 
   const std::string& pid_str = real_path.substr(pos + 1);
   if (!base::StringToInt(pid_str, pid))
     *pid = -1;
 
   return true;
 }
 
-void DisplayProfileInUseError(const std::string& lock_path,
+// Returns true if the user opted to unlock the profile.
+bool DisplayProfileInUseError(const base::FilePath& lock_path,
                               const std::string& hostname,
                               int pid) {
   string16 error = l10n_util::GetStringFUTF16(
       IDS_PROFILE_IN_USE_LINUX,
       base::IntToString16(pid),
       ASCIIToUTF16(hostname),
-      WideToUTF16(base::SysNativeMBToWide(lock_path)),
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
+  string16 relaunch_button_text = l10n_util::GetStringFUTF16(
+      IDS_PROFILE_IN_USE_LINUX_RELAUNCH,
+      string16());
   LOG(ERROR) << base::SysWideToNativeMB(UTF16ToWide(error)).c_str();
   if (!g_disable_prompt) {
 #if defined(TOOLKIT_GTK)
-    ProcessSingletonDialog::ShowAndRun(UTF16ToUTF8(error));
+    return ProcessSingletonDialog::ShowAndRun(
+        UTF16ToUTF8(error), UTF16ToUTF8(relaunch_button_text));
 #else
     NOTIMPLEMENTED();
 #endif
   }
+  return 0;
 }
 
 bool IsChromeProcess(pid_t pid) {
   base::FilePath other_chrome_path(base::GetProcessExecutablePath(pid));
   return (!other_chrome_path.empty() &&
           other_chrome_path.BaseName() ==
           base::FilePath(chrome::kBrowserProcessExecutableName));
 }
 
 // A helper class to hold onto a socket.
@@ skipping 403 matching lines @@
       // No lockfile exists.
       return PROCESS_NONE;
     }
 
     if (hostname.empty()) {
       // Invalid lockfile.
       UnlinkPath(lock_path_);
       return PROCESS_NONE;
     }
 
-    if (hostname != net::GetHostName()) {
-      // Locked by process on another host.
-      DisplayProfileInUseError(lock_path_.value(), hostname, pid);
+    if (hostname != net::GetHostName() && !IsChromeProcess(pid)) {
+      // Locked by process on another host. If the user selected to unlock
+      // the profile, try to continue; otherwise quit.
+      if (DisplayProfileInUseError(lock_path_, hostname, pid)) {
+        UnlinkPath(lock_path_);
+        return PROCESS_NONE;
+      }
       return PROFILE_IN_USE;
     }
 
     if (!IsChromeProcess(pid)) {
       // Orphaned lockfile (no process with pid, or non-chrome process.)
       UnlinkPath(lock_path_);
       return PROCESS_NONE;
     }
 
     if (IsSameChromeInstance(pid)) {
@@ skipping 201 matching lines @@
   }
   return true;
 }
 
 bool ProcessSingleton::KillProcessByLockPath() {
   std::string hostname;
   int pid;
   ParseLockPath(lock_path_, &hostname, &pid);
 
   if (!hostname.empty() && hostname != net::GetHostName()) {
-    DisplayProfileInUseError(lock_path_.value(), hostname, pid);
-    return false;
+    return DisplayProfileInUseError(lock_path_, hostname, pid);
   }
   UnlinkPath(lock_path_);
 
   if (IsSameChromeInstance(pid))
     return true;
 
   if (pid > 0) {
     kill_callback_.Run(pid);
     return true;
   }
 
   LOG(ERROR) << "Failed to extract pid from path: " << lock_path_.value();
   return true;
 }
 
 void ProcessSingleton::KillProcess(int pid) {
   // TODO(james.su@gmail.com): Is SIGKILL ok?
   int rv = kill(static_cast<base::ProcessHandle>(pid), SIGKILL);
   // ESRCH = No Such Process (can happen if the other process is already in
   // progress of shutting down and finishes before we try to kill it).
   DCHECK(rv == 0 || errno == ESRCH) << "Error killing process: "
                                     << safe_strerror(errno);
 }