chrome/browser/chromeos/drive/resource_metadata.cc - Issue 14858016: drive: Stop using callback for ResourceMetadataStorage::Iterate

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/chromeos/drive/resource_metadata.cc

Issue 14858016: drive: Stop using callback for ResourceMetadataStorage::Iterate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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: chrome/browser/chromeos/drive/resource_metadata.cc

diff --git a/chrome/browser/chromeos/drive/resource_metadata.cc b/chrome/browser/chromeos/drive/resource_metadata.cc

index 7da356d2d87a62b56bc5d3887b788b3f056d079a..7330dec1fd06c8b2bde4e8d47fb0073f4da0b347 100644

--- a/chrome/browser/chromeos/drive/resource_metadata.cc

+++ b/chrome/browser/chromeos/drive/resource_metadata.cc

@@ -827,7 +827,10 @@ void ResourceMetadata::IterateEntries(const IterateCallback& callback) {

DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread());

DCHECK(!callback.is_null());

- storage_->Iterate(callback);

+ scoped_ptr<ResourceMetadataStorage::Iterator> it = storage_->GetIterator();

+ for (; it->IsValid(); it->MoveForward())

+ callback.Run(it->Get());

+ DCHECK(!it->HasError()); // TODO(hashimoto): Report error correctly.

}

void ResourceMetadata::GetEntryInfoPairByPathsOnUIThreadAfterGetFirst(