Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2942)

Unified Diff: webkit/plugins/ppapi/ppb_file_ref_impl.cc

Issue 14671020: FileAPI: Copy base::FileUtilProxy::Entry to fileapi::DirectoryEntry (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win build and remove base/ change Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/plugins/ppapi/plugin_delegate.h ('k') | webkit/tools/test_shell/simple_file_system.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/ppb_file_ref_impl.cc
diff --git a/webkit/plugins/ppapi/ppb_file_ref_impl.cc b/webkit/plugins/ppapi/ppb_file_ref_impl.cc
index e57169c1c0cf60f6f9caa8550271246a4d54ccb7..ff95bbfbea8b13f8ed75d888fc60307f4ff87c81 100644
--- a/webkit/plugins/ppapi/ppb_file_ref_impl.cc
+++ b/webkit/plugins/ppapi/ppb_file_ref_impl.cc
@@ -4,6 +4,7 @@
#include "webkit/plugins/ppapi/ppb_file_ref_impl.h"
+#include "base/files/file_util_proxy.h"
#include "base/platform_file.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
@@ -15,6 +16,7 @@
#include "ppapi/shared_impl/var.h"
#include "ppapi/thunk/enter.h"
#include "ppapi/thunk/ppb_file_system_api.h"
+#include "webkit/fileapi/directory_entry.h"
#include "webkit/fileapi/file_system_util.h"
#include "webkit/plugins/ppapi/common.h"
#include "webkit/plugins/ppapi/plugin_delegate.h"
@@ -181,7 +183,7 @@ void DidReadDirectory(
PPB_FileRef_Impl* dir_ref,
linked_ptr<std::vector< ::ppapi::PPB_FileRef_CreateInfo> > dir_files,
linked_ptr<std::vector<PP_FileType> > dir_file_types,
- const std::vector<base::FileUtilProxy::Entry>& entries,
+ const std::vector<fileapi::DirectoryEntry>& entries,
bool has_more) {
if (!TrackedCallback::IsPending(callback))
return;
@@ -198,7 +200,7 @@ void DidReadDirectory(
dir_path += '/';
for (size_t i = 0; i < entries.size(); ++i) {
- const base::FileUtilProxy::Entry& entry = entries[i];
+ const fileapi::DirectoryEntry& entry = entries[i];
scoped_refptr<PPB_FileRef_Impl> file_ref(PPB_FileRef_Impl::CreateInternal(
dir_ref->pp_instance(),
dir_ref->file_system_resource(),
« no previous file with comments | « webkit/plugins/ppapi/plugin_delegate.h ('k') | webkit/tools/test_shell/simple_file_system.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698