Merge r2876 to the 1.0 release branch....

base/command_line.h

 // Copyright (c) 2006-2008 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.
-//
+
 // This file contains a class that can be used to extract the salient
 // elements of a command line in a relatively lightweight manner.
 // Switches can optionally have a value attached using an equals sign,
 // as in "-switch=value".  Arguments that aren't prefixed with a
 // switch prefix are considered "loose parameters".  Switch names
-// are case-insensitive.
+// are case-insensitive.  An argument of "--" will terminate switch parsing,
+// causing everything after to be considered as loose parameters.
 
-#ifndef BASE_COMMAND_LINE_H__
-#define BASE_COMMAND_LINE_H__
+#ifndef BASE_COMMAND_LINE_H_
+#define BASE_COMMAND_LINE_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 
 class CommandLine {
  public:
@@ skipping 45 matching lines @@
   // Returns the program part of the command line string (the first item).
   std::wstring program() const;
 
   // An array containing the prefixes that identify an argument as
   // a switch.
   static const wchar_t* const kSwitchPrefixes[];
 
   // The string that's used to separate switches from their values.
   static const wchar_t kSwitchValueSeparator[];
 
+  // Treat everything after this argument as loose parameters.
+  static const wchar_t kSwitchTerminator[];
+
   // Appends the given switch string (preceded by a space and a switch
   // prefix) to the given string.
   static void AppendSwitch(std::wstring* command_line_string,
                            const std::wstring& switch_string);
 
   // Appends the given switch string (preceded by a space and a switch
   // prefix) to the given string, with the given value attached.
   static void AppendSwitchWithValue(std::wstring* command_line_string,
                                     const std::wstring& switch_string,
                                     const std::wstring& value_string);
 
  private:
   class Data;
 
   // True if we are responsible for deleting our |data_| pointer.  In some cases
   // we cache the result of parsing the command line and |data_|'s lifetime is
   // managed by someone else (e.g., the |Singleton| class).
   bool we_own_data_;
 
   // A pointer to the parsed version of the command line.
   Data* data_;
   
   DISALLOW_EVIL_CONSTRUCTORS(CommandLine);
 };
 
-#endif  // BASE_COMMAND_LINE_H__
-
+#endif  // BASE_COMMAND_LINE_H_