summaryrefslogtreecommitdiffstats
path: root/base/file_path.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-05 23:59:36 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-05 23:59:36 +0000
commit5e207883834dc8a2ea39684e79e6b29d46c4013b (patch)
treef63a447bff245151fc8b1d1f6a061b429e5708d2 /base/file_path.cc
parent345e1b89c38bf19ebce483ae5392474bbf63ae59 (diff)
downloadchromium_src-5e207883834dc8a2ea39684e79e6b29d46c4013b.zip
chromium_src-5e207883834dc8a2ea39684e79e6b29d46c4013b.tar.gz
chromium_src-5e207883834dc8a2ea39684e79e6b29d46c4013b.tar.bz2
Keep trying to undo 7564.
tbr=jhawkins Review URL: http://codereview.chromium.org/17062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7572 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_path.cc')
-rw-r--r--base/file_path.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/file_path.cc b/base/file_path.cc
index 49193152..45f6e327 100644
--- a/base/file_path.cc
+++ b/base/file_path.cc
@@ -113,7 +113,7 @@ FilePath FilePath::DirName() const {
return new_path;
}
-FilePath::StringType FilePath::BaseName() const {
+FilePath FilePath::BaseName() const {
FilePath new_path(path_);
new_path.StripTrailingSeparatorsInternal();
@@ -133,7 +133,7 @@ FilePath::StringType FilePath::BaseName() const {
new_path.path_.erase(0, last_separator + 1);
}
- return new_path.path_;
+ return new_path;
}
FilePath FilePath::Append(const FilePath::StringType& component) const {