chrome/browser/media_galleries/linux/mtp_device_task_helper.cc - Issue 492873002: Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

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: chrome/browser/media_galleries/linux/mtp_device_task_helper.cc

Issue 492873002: Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix chromeos build Created 6 years, 4 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 | « chrome/browser/media_galleries/linux/mtp_device_task_helper.h ('k') | chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/linux/mtp_device_task_helper.cc

diff --git a/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc b/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc

index 0282c8a0e59036e6a34428c1c550b6d75d8b796a..b2e27e41716f3f3b295c5b8a4cb4c41ce5866781 100644

--- a/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc

+++ b/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc

@@ -182,12 +182,12 @@ void MTPDeviceTaskHelper::OnDidReadDirectory(

if (error)

return HandleDeviceError(error_callback, base::File::FILE_ERROR_FAILED);

- fileapi::AsyncFileUtil::EntryList entries;

+ storage::AsyncFileUtil::EntryList entries;

base::FilePath current;

MTPDeviceObjectEnumerator file_enum(file_entries);

while (!(current = file_enum.Next()).empty()) {

- fileapi::DirectoryEntry entry;

- entry.name = fileapi::VirtualPath::BaseName(current).value();

+ storage::DirectoryEntry entry;

+ entry.name = storage::VirtualPath::BaseName(current).value();

uint32 file_id = 0;

bool ret = file_enum.GetEntryId(&file_id);

DCHECK(ret);