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

Unified Diff: chrome/browser/chromeos/drive/drive_download_handler.cc

Issue 12040095: chromeos: Rename DriveDownloadHandler::GetDrivePath() to GetTargetPath(), make it return full path (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: _ Created 7 years, 11 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
Index: chrome/browser/chromeos/drive/drive_download_handler.cc
diff --git a/chrome/browser/chromeos/drive/drive_download_handler.cc b/chrome/browser/chromeos/drive/drive_download_handler.cc
index 34d528670385575af0d49fc242804ce1ebd4c34d..f8a0a7b070a89fd039e8078078f8ae06e2e101da 100644
--- a/chrome/browser/chromeos/drive/drive_download_handler.cc
+++ b/chrome/browser/chromeos/drive/drive_download_handler.cc
@@ -143,12 +143,12 @@ void DriveDownloadHandler::SetDownloadParams(const FilePath& drive_path,
}
}
-FilePath DriveDownloadHandler::GetDrivePath(const DownloadItem* download) {
+FilePath DriveDownloadHandler::GetTargetPath(const DownloadItem* download) {
const DriveUserData* data = GetDriveUserData(download);
// If data is NULL, we've somehow lost the drive path selected by the file
// picker.
DCHECK(data);
- return data ? util::ExtractDrivePath(data->file_path()) : FilePath();
+ return data ? data->file_path() : FilePath();
}
bool DriveDownloadHandler::IsDriveDownload(const DownloadItem* download) {
@@ -231,7 +231,7 @@ void DriveDownloadHandler::OnCreateDirectory(
void DriveDownloadHandler::UploadDownloadItem(DownloadItem* download) {
DCHECK(download->IsComplete());
file_write_helper_->PrepareWritableFileAndRun(
- GetDrivePath(download),
+ util::ExtractDrivePath(GetTargetPath(download)),
base::Bind(&MoveDownloadedFile, download->GetTargetFilePath()));
}
« no previous file with comments | « chrome/browser/chromeos/drive/drive_download_handler.h ('k') | chrome/browser/download/download_file_picker_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698