summaryrefslogtreecommitdiffstats
path: root/base/files/file_path.cc
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-09 06:41:12 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-09 06:41:12 +0000
commit69d7f89d6a93e0fbce451960287066195c6d4ea0 (patch)
tree51c8c1f971d39d652ec38ed76070539bb33e85c7 /base/files/file_path.cc
parente3748a79b523a8d365d4a33ef986eebb4186fa78 (diff)
downloadchromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.zip
chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.tar.gz
chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.tar.bz2
Revert "Rewrite std::string("") to std::string(), Linux edition."
This reverts commit e59558b78e8c6a1b0bd916a724724b638c3c91b6. Revert "Fix build after r193020." This reverts commit 558a35897f6b3ffbcaefde927c1f150b815d140a. Revert "Really fix build after r193020." This reverts commit e3748a79b523a8d365d4a33ef986eebb4186fa78. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/files/file_path.cc')
-rw-r--r--base/files/file_path.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/files/file_path.cc b/base/files/file_path.cc
index 01d9eab..72604e8 100644
--- a/base/files/file_path.cc
+++ b/base/files/file_path.cc
@@ -552,7 +552,7 @@ string16 FilePath::LossyDisplayName() const {
std::string FilePath::MaybeAsASCII() const {
if (IsStringASCII(path_))
return path_;
- return std::string();
+ return "";
}
std::string FilePath::AsUTF8Unsafe() const {