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

Unified Diff: content/common/fileapi/webfilesystem_callback_adapters.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 | « content/common/fileapi/webfilesystem_callback_adapters.h ('k') | webkit/chromeos/fileapi/file_util_async.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/fileapi/webfilesystem_callback_adapters.cc
diff --git a/content/common/fileapi/webfilesystem_callback_adapters.cc b/content/common/fileapi/webfilesystem_callback_adapters.cc
index 228371a190a9386d349c7d9841f9331033f081cc..f12adea06646344d0d41e65aa9fa247047f02d83 100644
--- a/content/common/fileapi/webfilesystem_callback_adapters.cc
+++ b/content/common/fileapi/webfilesystem_callback_adapters.cc
@@ -7,7 +7,6 @@
#include <string>
#include <vector>
-#include "base/files/file_util_proxy.h"
#include "base/logging.h"
#include "base/utf_string_conversions.h"
#include "googleurl/src/gurl.h"
@@ -15,6 +14,7 @@
#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
#include "webkit/base/file_path_string_conversions.h"
+#include "webkit/fileapi/directory_entry.h"
#include "webkit/fileapi/file_system_util.h"
#include "webkit/glue/webkit_glue.h"
@@ -57,7 +57,7 @@ void CreateSnapshotFileCallbackAdapter(
void ReadDirectoryCallbackAdapater(
WebKit::WebFileSystemCallbacks* callbacks,
- const std::vector<base::FileUtilProxy::Entry>& entries,
+ const std::vector<fileapi::DirectoryEntry>& entries,
bool has_more) {
WebVector<WebFileSystemEntry> file_system_entries(entries.size());
for (size_t i = 0; i < entries.size(); i++) {
« no previous file with comments | « content/common/fileapi/webfilesystem_callback_adapters.h ('k') | webkit/chromeos/fileapi/file_util_async.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698