| Index: webkit/fileapi/file_system_dir_url_request_job.cc
|
| diff --git a/webkit/fileapi/file_system_dir_url_request_job.cc b/webkit/fileapi/file_system_dir_url_request_job.cc
|
| index e1031dfe9b4d57a2f03c11f37c7e387af810c526..5943bcd6bd8ead62248756b31ce4ea407f3609b8 100644
|
| --- a/webkit/fileapi/file_system_dir_url_request_job.cc
|
| +++ b/webkit/fileapi/file_system_dir_url_request_job.cc
|
| @@ -108,9 +108,9 @@ void FileSystemDirURLRequestJob::DidReadDirectory(
|
| return;
|
|
|
| if (data_.empty()) {
|
| - FilePath relative_path = url_.path();
|
| + base::FilePath relative_path = url_.path();
|
| #if defined(OS_POSIX)
|
| - relative_path = FilePath(FILE_PATH_LITERAL("/") + relative_path.value());
|
| + relative_path = base::FilePath(FILE_PATH_LITERAL("/") + relative_path.value());
|
| #endif
|
| const string16& title = relative_path.LossyDisplayName();
|
| data_.append(net::GetDirectoryListingHeader(title));
|
| @@ -118,7 +118,7 @@ void FileSystemDirURLRequestJob::DidReadDirectory(
|
|
|
| typedef std::vector<base::FileUtilProxy::Entry>::const_iterator EntryIterator;
|
| for (EntryIterator it = entries.begin(); it != entries.end(); ++it) {
|
| - const string16& name = FilePath(it->name).LossyDisplayName();
|
| + const string16& name = base::FilePath(it->name).LossyDisplayName();
|
| data_.append(net::GetDirectoryListingEntry(
|
| name, std::string(), it->is_directory, it->size,
|
| it->last_modified_time));
|
|
|