diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 20:30:45 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 20:30:45 +0000 |
| commit | fc8edf5c2a5af722cbfe4c1605b5c0de4c17ae9b (patch) | |
| tree | c89f45ac847d97edae1ca0fafd391c31e86f2d65 /base | |
| parent | 8a340e008c9ddf072d1deea25af7c142db7f8b50 (diff) | |
| download | chromium_src-fc8edf5c2a5af722cbfe4c1605b5c0de4c17ae9b.zip chromium_src-fc8edf5c2a5af722cbfe4c1605b5c0de4c17ae9b.tar.gz chromium_src-fc8edf5c2a5af722cbfe4c1605b5c0de4c17ae9b.tar.bz2 | |
CommandLine: remove wstring-based program() accessor
This was already removed on non-Windows, so this change modifies
the remaining Windows-specific usage. In a few places I converted
use of wstring paths into FilePath, but in general for Windows-specific
code I don't think it's too important to use FilePath everywhere,
because it is equivalent on Windows and the current code already works.
BUG=23581
Review URL: http://codereview.chromium.org/3817001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/command_line.cc | 6 | ||||
| -rw-r--r-- | base/command_line.h | 1 | ||||
| -rw-r--r-- | base/command_line_unittest.cc | 2 |
3 files changed, 1 insertions, 8 deletions
diff --git a/base/command_line.cc b/base/command_line.cc index 1c39066..2fdc176 100644 --- a/base/command_line.cc +++ b/base/command_line.cc @@ -340,12 +340,6 @@ FilePath CommandLine::GetProgram() const { #endif } -#if defined(OS_WIN) -std::wstring CommandLine::program() const { - return program_; -} -#endif - #if defined(OS_POSIX) std::string CommandLine::command_line_string() const { return JoinString(argv_, ' '); diff --git a/base/command_line.h b/base/command_line.h index 31c0f5f..ec8714f 100644 --- a/base/command_line.h +++ b/base/command_line.h @@ -164,7 +164,6 @@ class CommandLine { // TODO(evanm): remove all of these. #if defined(OS_WIN) // Deprecated on non-Windows. - std::wstring program() const; bool HasSwitch(const std::wstring& switch_string) const; #endif diff --git a/base/command_line_unittest.cc b/base/command_line_unittest.cc index cd26fc5..9184aa3 100644 --- a/base/command_line_unittest.cc +++ b/base/command_line_unittest.cc @@ -106,7 +106,7 @@ TEST(CommandLineTest, EmptyString) { #if defined(OS_WIN) CommandLine cl = CommandLine::FromString(L""); EXPECT_TRUE(cl.command_line_string().empty()); - EXPECT_TRUE(cl.program().empty()); + EXPECT_TRUE(cl.GetProgram().empty()); #elif defined(OS_POSIX) CommandLine cl(0, NULL); EXPECT_TRUE(cl.argv().size() == 0); |