chrome/browser/chromeos/gdata/gdata_uploader.cc - Issue 10828385: Rename DocumentsServiceInterface to DriveServiceInterface.

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/gdata/gdata_uploader.cc

Issue 10828385: Rename DocumentsServiceInterface to DriveServiceInterface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase. Created 8 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

« chrome/browser/chromeos/gdata/gdata_protocol_handler.cc ('K') | « chrome/browser/chromeos/gdata/gdata_uploader.h ('k') | chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/gdata/gdata_uploader.cc

diff --git a/chrome/browser/chromeos/gdata/gdata_uploader.cc b/chrome/browser/chromeos/gdata/gdata_uploader.cc

index 114fd3cca81204ea5278077c670b09c98b808a1c..11ba9ee151c7af6c90b678ff9bfbd8ff2dfb23f5 100644

--- a/chrome/browser/chromeos/gdata/gdata_uploader.cc

+++ b/chrome/browser/chromeos/gdata/gdata_uploader.cc

@@ -8,10 +8,11 @@

#include "base/bind.h"

#include "base/callback.h"

-#include "chrome/browser/chromeos/gdata/documents_service_interface.h"

+#include "chrome/browser/chromeos/gdata/drive_service_interface.h"

#include "chrome/browser/chromeos/gdata/gdata_directory_service.h"

#include "chrome/browser/chromeos/gdata/gdata_upload_file_info.h"

#include "chrome/browser/chromeos/gdata/gdata_wapi_parser.h"

+#include "chrome/browser/chromeos/gdata/gdata_wapi_service.h"

kochi 2012/08/21 02:34:51 Looks like an unnecessary header file sneaked in.

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/download_item.h"

#include "net/base/file_stream.h"

@@ -31,8 +32,8 @@ const int kMaxFileOpenTries = 5;

namespace gdata {

-GDataUploader::GDataUploader(DocumentsServiceInterface* documents_service)

- : documents_service_(documents_service),

+GDataUploader::GDataUploader(DriveServiceInterface* drive_service)

+ : drive_service_(drive_service),

next_upload_id_(0),

ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {

}

@@ -240,7 +241,7 @@ void GDataUploader::OpenCompletionCallback(int upload_id, int result) {

GDATA_FILE_ERROR_ABORT);

return;

}

- documents_service_->InitiateUpload(

+ drive_service_->InitiateUpload(

InitiateUploadParams(upload_file_info->upload_mode,

upload_file_info->title,

upload_file_info->content_type,

@@ -366,7 +367,7 @@ void GDataUploader::ResumeUpload(int upload_id) {

if (!upload_file_info)

return;

- documents_service_->ResumeUpload(

+ drive_service_->ResumeUpload(

ResumeUploadParams(upload_file_info->upload_mode,

upload_file_info->start_range,

upload_file_info->end_range,