Extract locking behaviour from ProcessSingleton.

chrome/browser/process_singleton_win.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.
 
 #include "chrome/browser/process_singleton.h"
 
 #include <shellapi.h>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 237 matching lines @@
       ::Sleep(10);
     }
     return true;
   }
   return false;
 }
 
 ProcessSingleton::ProcessSingleton(
     const base::FilePath& user_data_dir,
     const NotificationCallback& notification_callback)
-    : window_(NULL), locked_(false), foreground_window_(NULL),
-      notification_callback_(notification_callback),
+    : window_(NULL), notification_callback_(notification_callback),
       is_virtualized_(false), lock_file_(INVALID_HANDLE_VALUE),
       user_data_dir_(user_data_dir) {
 }
 
 ProcessSingleton::~ProcessSingleton() {
   // We need to unregister the window as late as possible so that we can detect
   // another instance of chrome running. Otherwise we may end up writing out
   // data while a new chrome is starting up.
   if (window_) {
     ::DestroyWindow(window_);
@@ skipping 260 matching lines @@
     }
   }
 
   return window_ != NULL;
 }
 
 void ProcessSingleton::Cleanup() {
 }
 
 LRESULT ProcessSingleton::OnCopyData(HWND hwnd, const COPYDATASTRUCT* cds) {
-  // If locked, it means we are not ready to process this message because
-  // we are probably in a first run critical phase.
-  if (locked_) {
-#if defined(USE_AURA)
-    NOTIMPLEMENTED();
-#else
-    // Attempt to place ourselves in the foreground / flash the task bar.
-    if (foreground_window_ != NULL && IsWindow(foreground_window_)) {
-      SetForegroundWindow(foreground_window_);

[robertshield, 2013/03/27 14:51:38]

This is at least a small change in behaviour in that the SetForegroundWindow()
call may no longer happen if e.g. ParseCommandLine fails. Please mention this in
the CL description.

[erikwright (departed), 2013/03/28 03:16:34]

Done.

-    } else {
-      // Read the command line and store it. It will be replayed when the
-      // ProcessSingleton becomes unlocked.
-      CommandLine parsed_command_line(CommandLine::NO_PROGRAM);
-      base::FilePath current_directory;
-      if (ParseCommandLine(cds, &parsed_command_line, &current_directory))
-        saved_startup_messages_.push_back(
-            std::make_pair(parsed_command_line.argv(), current_directory));
-    }
-#endif
-    return TRUE;
-  }
-
   CommandLine parsed_command_line(CommandLine::NO_PROGRAM);
   base::FilePath current_directory;
   if (!ParseCommandLine(cds, &parsed_command_line, &current_directory))
     return TRUE;
   return notification_callback_.Run(parsed_command_line, current_directory) ?
       TRUE : FALSE;
 }
 
 LRESULT ProcessSingleton::WndProc(HWND hwnd, UINT message,
                                   WPARAM wparam, LPARAM lparam) {
   switch (message) {
     case WM_COPYDATA:
       return OnCopyData(reinterpret_cast<HWND>(wparam),
                         reinterpret_cast<COPYDATASTRUCT*>(lparam));
     default:
       break;
   }
 
   return ::DefWindowProc(hwnd, message, wparam, lparam);
 }