summaryrefslogtreecommitdiffstats
path: root/base/command_line.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-04 18:24:38 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-04 18:24:38 +0000
commit13081fccbf907aef8476c94d904fc94d6c59a206 (patch)
tree9470fa1206aba0c8b41ad569a019c7ad484ab7ab /base/command_line.cc
parent815d63d9f1c68ffa056ad2c2c8fee34f0d0b70b8 (diff)
downloadchromium_src-13081fccbf907aef8476c94d904fc94d6c59a206.zip
chromium_src-13081fccbf907aef8476c94d904fc94d6c59a206.tar.gz
chromium_src-13081fccbf907aef8476c94d904fc94d6c59a206.tar.bz2
PrependWrapper is platform-specific, so it should take a platform string.
Though the comments said it was POSIX only, I see it used on Windows as well so I'm updating the comment. Review URL: http://codereview.chromium.org/3030043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54933 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/command_line.cc')
-rw-r--r--base/command_line.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/base/command_line.cc b/base/command_line.cc
index e180ddf..8d36e16 100644
--- a/base/command_line.cc
+++ b/base/command_line.cc
@@ -432,6 +432,8 @@ void CommandLine::AppendArguments(const CommandLine& other,
}
void CommandLine::PrependWrapper(const std::wstring& wrapper) {
+ if (wrapper.empty())
+ return;
// The wrapper may have embedded arguments (like "gdb --args"). In this case,
// we don't pretend to do anything fancy, we just split on spaces.
std::vector<std::wstring> wrapper_and_args;
@@ -475,10 +477,9 @@ void CommandLine::AppendArguments(const CommandLine& other,
switches_[i->first] = i->second;
}
-void CommandLine::PrependWrapper(const std::wstring& wrapper_wide) {
+void CommandLine::PrependWrapper(const std::string& wrapper) {
// The wrapper may have embedded arguments (like "gdb --args"). In this case,
// we don't pretend to do anything fancy, we just split on spaces.
- const std::string wrapper = base::SysWideToNativeMB(wrapper_wide);
std::vector<std::string> wrapper_and_args;
SplitString(wrapper, ' ', &wrapper_and_args);
argv_.insert(argv_.begin(), wrapper_and_args.begin(), wrapper_and_args.end());