Cleanup: USE_X11 + OS_MACOSX = OS_POSIX.

chrome/browser/process_singleton.h

 // Copyright (c) 2010 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_
 #pragma once
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
-#endif
+#endif  // defined(OS_WIN)
 
 #include "base/basictypes.h"
-#if defined(USE_X11) || defined(OS_MACOSX)
-#include "base/file_path.h"
-#endif
 #include "base/logging.h"
 #include "base/non_thread_safe.h"
 #include "base/ref_counted.h"
 #include "gfx/native_widget_types.h"
+
+#if defined(OS_POSIX)
+#include "base/file_path.h"
+#endif  // defined(OS_POSIX)
+
 #if defined(USE_X11)
 #include "base/scoped_temp_dir.h"
-#endif
+#endif  // defined(USE_X11)
 
 class CommandLine;
 class FilePath;
 
 // 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.
@@ skipping 22 matching lines @@
   // TODO(brettw): this will not handle all cases. If two process start up too
   // close to each other, the Create() might not yet have happened for the
   // first one, so this function won't find it.
   NotifyResult NotifyOtherProcess();
 
   // Notify another process, if available.  Otherwise sets ourselves as the
   // singleton instance.  Returns PROCESS_NONE if we became the singleton
   // instance.
   NotifyResult NotifyOtherProcessOrCreate();
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(USE_X11)

[evanm, 2010/12/15 02:12:53]

Is this really an X11-specific block of code?
Consider e.g. a future version of ChromeOS that doesn't use X.

[Lei Zhang, 2010/12/21 05:14:43]

Changed this to OS_LINUX since it's only implemented in
process_singleton_linux.cc.

   // Exposed for testing.  We use a timeout on Linux, and in tests we want
   // this timeout to be short.
   NotifyResult NotifyOtherProcessWithTimeout(const CommandLine& command_line,
                                              int timeout_seconds,
                                              bool kill_unresponsive);
   NotifyResult NotifyOtherProcessWithTimeoutOrCreate(
       const CommandLine& command_line,
       int timeout_seconds);
-#endif
+#endif  // defined(USE_X11)
 
   // Sets ourself up as the singleton instance.  Returns true on success.  If
   // false is returned, we are not the singleton instance and the caller must
   // exit.
   bool Create();
 
   // Clear any lock state during shutdown.
   void Cleanup();
 
   // Blocks the dispatch of CopyData messages. foreground_window refers
@@ skipping 71 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_