ProcessSingleton now uses base::win::MessageWindow to create a message-only window.

chrome/browser/process_singleton.h

 // 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.
 
 #ifndef CHROME_BROWSER_PROCESS_SINGLETON_H_
 #define CHROME_BROWSER_PROCESS_SINGLETON_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
@@ skipping 10 matching lines @@
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/process.h"
 #include "base/threading/non_thread_safe.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_LINUX) || defined(OS_OPENBSD)
 #include "base/files/scoped_temp_dir.h"
 #endif  // defined(OS_LINUX) || defined(OS_OPENBSD)
 
+#if defined(OS_WIN)
+#include "base/win/message_window.h"
+#endif  // defined(OS_WIN)
+
 class CommandLine;
 
 // ProcessSingleton ----------------------------------------------------------
 //
 // This class allows different browser processes to communicate with
 // each other.  It is named according to the user data directory, so
 // we can be sure that no more than one copy of the application can be
 // running at once with a given data directory.
 //
 // Implementation notes:
@@ skipping 36 matching lines @@
   // false is returned, we are not the singleton instance and the caller must
   // exit.
   // NOTE: Most callers should generally prefer NotifyOtherProcessOrCreate() to
   // this method, only callers for whom failure is prefered to notifying another
   // process should call this directly.
   bool Create();
 
   // Clear any lock state during shutdown.
   void Cleanup();
 
-#if defined(OS_WIN)
-  LRESULT WndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
-#endif
-
 #if defined(OS_LINUX) || defined(OS_OPENBSD)
   static void DisablePromptForTesting();
 #endif  // defined(OS_LINUX) || defined(OS_OPENBSD)
 
  protected:
   // Notify another process, if available.
   // Returns true if another process was found and notified, false if we should
   // continue with the current process.
   // On Windows, Create() has to be called before this.
   NotifyResult NotifyOtherProcess();
@@ skipping 15 matching lines @@
  private:
 #if !defined(OS_MACOSX)
   // Timeout for the current browser process to respond. 20 seconds should be
   // enough. It's only used in Windows and Linux implementations.
   static const int kTimeoutInSeconds = 20;
 #endif
 
   NotificationCallback notification_callback_;  // Handler for notifications.
 
 #if defined(OS_WIN)
-  // This ugly behemoth handles startup commands sent from another process.
-  LRESULT OnCopyData(HWND hwnd, const COPYDATASTRUCT* cds);
-
   bool EscapeVirtualization(const base::FilePath& user_data_dir);
 
   HWND remote_window_;  // The HWND_MESSAGE of another browser.
-  HWND window_;  // The HWND_MESSAGE window.
+  base::win::MessageWindow window_;  // The message-only window.
   bool is_virtualized_;  // Stuck inside Microsoft Softricity VM environment.
   HANDLE lock_file_;
   base::FilePath user_data_dir_;
 #elif defined(OS_LINUX) || defined(OS_OPENBSD)
   // Return true if the given pid is one of our child processes.
   // Assumes that the current pid is the root of all pids of the current
   // instance.
   bool IsSameChromeInstance(pid_t pid);
 
   // Extract the process's pid from a symbol link path and if it is on
@@ skipping 36 matching lines @@
   // File descriptor associated with the lockfile, valid between
   // |Create()| and |Cleanup()|.  Two instances cannot have a lock on
   // the same file at the same time.
   int lock_fd_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ProcessSingleton);
 };
 
 #endif  // CHROME_BROWSER_PROCESS_SINGLETON_H_