| Index: base/command_line.h
|
| diff --git a/base/command_line.h b/base/command_line.h
|
| index 3de8873e26aa608352415065ac4885ae238044be..6f90bc0b7f9b7c13975cdd85b017352eae8f7c5b 100644
|
| --- a/base/command_line.h
|
| +++ b/base/command_line.h
|
| @@ -31,10 +31,7 @@ class FilePath;
|
|
|
| class BASE_EXPORT CommandLine {
|
| public:
|
| -#if defined(OS_WIN)
|
| - // The native command line string type.
|
| - typedef base::string16 StringType;
|
| -#elif defined(OS_POSIX)
|
| +#if defined(OS_POSIX)
|
| typedef std::string StringType;
|
| #endif
|
|
|
| @@ -60,17 +57,6 @@ class BASE_EXPORT CommandLine {
|
|
|
| ~CommandLine();
|
|
|
| -#if defined(OS_WIN)
|
| - // By default this class will treat command-line arguments beginning with
|
| - // slashes as switches on Windows, but not other platforms.
|
| - //
|
| - // If this behavior is inappropriate for your application, you can call this
|
| - // function BEFORE initializing the current process' global command line
|
| - // object and the behavior will be the same as Posix systems (only hyphens
|
| - // begin switches, everything else will be an arg).
|
| - static void set_slash_is_not_a_switch();
|
| -#endif
|
| -
|
| // Initialize the current process CommandLine singleton. On Windows, ignores
|
| // its arguments (we instead parse GetCommandLineW() directly) because we
|
| // don't trust the CRT's parsing of the command line, but it still must be
|
| @@ -93,10 +79,6 @@ class BASE_EXPORT CommandLine {
|
| // Returns true if the CommandLine has been initialized for the given process.
|
| static bool InitializedForCurrentProcess();
|
|
|
| -#if defined(OS_WIN)
|
| - static CommandLine FromString(const base::string16& command_line);
|
| -#endif
|
| -
|
| // Initialize from an argv vector.
|
| void InitFromArgv(int argc, const CharType* const* argv);
|
| void InitFromArgv(const StringVector& argv);
|
| @@ -108,19 +90,6 @@ class BASE_EXPORT CommandLine {
|
| return GetCommandLineStringInternal(false);
|
| }
|
|
|
| -#if defined(OS_WIN)
|
| - // Constructs and returns the represented command line string. Assumes the
|
| - // command line contains placeholders (eg, %1) and quotes any program or
|
| - // argument with a '%' in it. This should be avoided unless the placeholder is
|
| - // required by an external interface (eg, the Windows registry), because it is
|
| - // not generally safe to replace it with an arbitrary string. If possible,
|
| - // placeholders should be replaced *before* converting the command line to a
|
| - // string.
|
| - StringType GetCommandLineStringWithPlaceholders() const {
|
| - return GetCommandLineStringInternal(true);
|
| - }
|
| -#endif
|
| -
|
| // Constructs and returns the represented arguments string.
|
| // CAUTION! This should be avoided on POSIX because quoting behavior is
|
| // unclear.
|
| @@ -128,18 +97,6 @@ class BASE_EXPORT CommandLine {
|
| return GetArgumentsStringInternal(false);
|
| }
|
|
|
| -#if defined(OS_WIN)
|
| - // Constructs and returns the represented arguments string. Assumes the
|
| - // command line contains placeholders (eg, %1) and quotes any argument with a
|
| - // '%' in it. This should be avoided unless the placeholder is required by an
|
| - // external interface (eg, the Windows registry), because it is not generally
|
| - // safe to replace it with an arbitrary string. If possible, placeholders
|
| - // should be replaced *before* converting the arguments to a string.
|
| - StringType GetArgumentsStringWithPlaceholders() const {
|
| - return GetArgumentsStringInternal(true);
|
| - }
|
| -#endif
|
| -
|
| // Returns the original command line string as a vector of strings.
|
| const StringVector& argv() const { return argv_; }
|
|
|
| @@ -200,12 +157,6 @@ class BASE_EXPORT CommandLine {
|
| // Common for debuggers, like "valgrind" or "gdb --args".
|
| void PrependWrapper(const StringType& wrapper);
|
|
|
| -#if defined(OS_WIN)
|
| - // Initialize by parsing the given command line string.
|
| - // The program name is assumed to be the first item in the string.
|
| - void ParseFromString(const base::string16& command_line);
|
| -#endif
|
| -
|
| private:
|
| // Disallow default constructor; a program name must be explicitly specified.
|
| CommandLine();
|
|
|