content/browser/fileapi/fileapi_message_filter.cc - Issue 14671020: FileAPI: Copy base::FileUtilProxy::Entry to fileapi::DirectoryEntry

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/fileapi/fileapi_message_filter.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:

Index: content/browser/fileapi/fileapi_message_filter.cc

diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc

index 966490eb7d498c74ec74205e915c931c7c701504..2ffa88a5fefc3b7824d5e70dd73c77020701bcd1 100644

--- a/content/browser/fileapi/fileapi_message_filter.cc

+++ b/content/browser/fileapi/fileapi_message_filter.cc

@@ -27,6 +27,7 @@

#include "webkit/blob/blob_data.h"

#include "webkit/blob/blob_storage_controller.h"

#include "webkit/blob/shareable_file_reference.h"

+#include "webkit/fileapi/directory_entry.h"

#include "webkit/fileapi/file_observers.h"

#include "webkit/fileapi/file_permission_policy.h"

#include "webkit/fileapi/file_system_context.h"

@@ -650,7 +651,7 @@ void FileAPIMessageFilter::DidGetMetadata(

void FileAPIMessageFilter::DidReadDirectory(

int request_id,

base::PlatformFileError result,

- const std::vector<base::FileUtilProxy::Entry>& entries,

+ const std::vector<fileapi::DirectoryEntry>& entries,

bool has_more) {

if (result == base::PLATFORM_FILE_OK)

Send(new FileSystemMsg_DidReadDirectory(request_id, entries, has_more));