diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 00:06:31 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 00:06:31 +0000 |
| commit | 78c4c4239c99f188dc63377cfc889876be65ee73 (patch) | |
| tree | 6720ade2077e8eb510229a2dd414e57d7b03cd03 /base/command_line.cc | |
| parent | de9eccd48ba30a46986d793c4acf50668d36ea5c (diff) | |
| download | chromium_src-78c4c4239c99f188dc63377cfc889876be65ee73.zip chromium_src-78c4c4239c99f188dc63377cfc889876be65ee73.tar.gz chromium_src-78c4c4239c99f188dc63377cfc889876be65ee73.tar.bz2 | |
CommandLine: deprecate another function on non-Windows
BUG=23581
TEST=CommandLine unit tests
Review URL: http://codereview.chromium.org/3549023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/command_line.cc')
| -rw-r--r-- | base/command_line.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/base/command_line.cc b/base/command_line.cc index 4d76ed0..477b4e7 100644 --- a/base/command_line.cc +++ b/base/command_line.cc @@ -332,18 +332,18 @@ CommandLine::StringType CommandLine::GetSwitchValueNative( } FilePath CommandLine::GetProgram() const { - return FilePath::FromWStringHack(program()); +#if defined(OS_WIN) + return FilePath(program_); +#else + DCHECK_GT(argv_.size(), 0U); + return FilePath(argv_[0]); +#endif } #if defined(OS_WIN) std::wstring CommandLine::program() const { return program_; } -#else -std::wstring CommandLine::program() const { - DCHECK_GT(argv_.size(), 0U); - return base::SysNativeMBToWide(argv_[0]); -} #endif #if defined(OS_POSIX) |