| Index: webkit/plugins/ppapi/ppb_directory_reader_impl.cc
|
| ===================================================================
|
| --- webkit/plugins/ppapi/ppb_directory_reader_impl.cc (revision 72915)
|
| +++ webkit/plugins/ppapi/ppb_directory_reader_impl.cc (working copy)
|
| @@ -123,16 +123,16 @@
|
| }
|
|
|
| void PPB_DirectoryReader_Impl::AddNewEntries(
|
| - const std::vector<base::FileUtilProxy::Entry>& entries, bool has_more) {
|
| + const std::vector<base::FileUtilProxyBase::Entry>& entries, bool has_more) {
|
| DCHECK(!entries.empty());
|
| has_more_ = has_more;
|
| std::string dir_path = directory_ref_->GetPath();
|
| if (dir_path[dir_path.size() - 1] != '/')
|
| dir_path += '/';
|
| FilePath::StringType dir_file_path = UTF8StringToFilePathString(dir_path);
|
| - for (std::vector<base::FileUtilProxy::Entry>::const_iterator it =
|
| + for (std::vector<base::FileUtilProxyBase::Entry>::const_iterator it =
|
| entries.begin(); it != entries.end(); it++) {
|
| - base::FileUtilProxy::Entry entry;
|
| + base::FileUtilProxyBase::Entry entry;
|
| entry.name = dir_file_path + it->name;
|
| entry.is_directory = it->is_directory;
|
| entries_.push(entry);
|
| @@ -145,7 +145,7 @@
|
| bool PPB_DirectoryReader_Impl::FillUpEntry() {
|
| DCHECK(entry_);
|
| if (!entries_.empty()) {
|
| - base::FileUtilProxy::Entry dir_entry = entries_.front();
|
| + base::FileUtilProxyBase::Entry dir_entry = entries_.front();
|
| entries_.pop();
|
| if (entry_->file_ref)
|
| ResourceTracker::Get()->UnrefResource(entry_->file_ref);
|
|
|