chrome/browser/chromeos/drive/file_system.cc - Issue 214363002: drive: Return cancel closure from FileSystem::GetFileContent

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/file_system.cc

Issue 214363002: drive: Return cancel closure from FileSystem::GetFileContent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add comment Created 6 years, 9 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/file_system.cc

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

index 3d1fad1903947516f8849bda3517115e29e0b8e7..4e67ffad4ad4d91ee91dff32ccdacf842793b0eb 100644

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

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

@@ -612,7 +612,7 @@ void FileSystem::GetFileForSaving(const base::FilePath& file_path,

get_file_for_saving_operation_->GetFileForSaving(file_path, callback);

}

-void FileSystem::GetFileContent(

+base::Closure FileSystem::GetFileContent(

const base::FilePath& file_path,

const GetFileContentInitializedCallback& initialized_callback,

const google_apis::GetContentCallback& get_content_callback,

@@ -622,7 +622,7 @@ void FileSystem::GetFileContent(

DCHECK(!get_content_callback.is_null());

DCHECK(!completion_callback.is_null());

- download_operation_->EnsureFileDownloadedByPath(

+ return download_operation_->EnsureFileDownloadedByPath(

file_path,

ClientContext(USER_INITIATED),

initialized_callback,