summaryrefslogtreecommitdiffstats
path: root/tools/imagediff
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-21 15:57:23 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-21 15:57:23 +0000
commit2e4c50cd49a81bef973b934c236b110e660f3746 (patch)
treeae4a3d58d0a8efc60d47494305b59c57980eac78 /tools/imagediff
parent445a971d141c3b745a84f8fed3a2d627789ebf22 (diff)
downloadchromium_src-2e4c50cd49a81bef973b934c236b110e660f3746.zip
chromium_src-2e4c50cd49a81bef973b934c236b110e660f3746.tar.gz
chromium_src-2e4c50cd49a81bef973b934c236b110e660f3746.tar.bz2
Remove deprecated CommandLine::GetLooseValues(), rename to args().
It returned a wstring, when really we wanted the native encoded strings. Fixing the majority of callers actually simplified them in many cases because the callers wanted native strings too. Since I'm touching every caller, I gave it a more useful name. I'm not sure where "loose" came from but it never made sense to me. BUG=24672 Review URL: http://codereview.chromium.org/3028010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53193 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/imagediff')
-rw-r--r--tools/imagediff/image_diff.cc18
1 files changed, 7 insertions, 11 deletions
diff --git a/tools/imagediff/image_diff.cc b/tools/imagediff/image_diff.cc
index d755b6f..ccf356c 100644
--- a/tools/imagediff/image_diff.cc
+++ b/tools/imagediff/image_diff.cc
@@ -363,19 +363,15 @@ int main(int argc, const char* argv[]) {
return 0;
}
- // TODO: CommandLine::GetLooseValues() should eventually return
- // CommandLine::StringType (which is the same as
- // FilePath::StringType and can convert to FilePaths directly).
- std::vector<std::wstring> values = parsed_command_line.GetLooseValues();
+ const std::vector<CommandLine::StringType>& args = parsed_command_line.args();
if (parsed_command_line.HasSwitch(kOptionGenerateDiff)) {
- if (values.size() == 3) {
- return DiffImages(FilePath::FromWStringHack(values[0]),
- FilePath::FromWStringHack(values[1]),
- FilePath::FromWStringHack(values[2]));
+ if (args.size() == 3) {
+ return DiffImages(FilePath(args[0]),
+ FilePath(args[1]),
+ FilePath(args[2]));
}
- } else if (values.size() == 2) {
- return CompareImages(FilePath::FromWStringHack(values[0]),
- FilePath::FromWStringHack(values[1]));
+ } else if (args.size() == 2) {
+ return CompareImages(FilePath(args[0]), FilePath(args[1]));
}
PrintHelp();