chrome/browser/chromeos/gdata/gdata_uploader.h - Issue 10877006: Rename GDataErrorCode to DriveErrorCode, GDataFileError to DriveFileError

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.h

Issue 10877006: Rename GDataErrorCode to DriveErrorCode, GDataFileError to DriveFileError (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_contacts_service.cc ('K') | « chrome/browser/chromeos/gdata/gdata_upload_file_info.h ('k') | chrome/browser/chromeos/gdata/gdata_uploader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8f15b3a50dc3253c646ef61f32bbd4c7d1d86dc7..01944060e6451dc16ae7e4cfc835229ac502391a 100644

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

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

@@ -12,7 +12,7 @@

#include "base/basictypes.h"

#include "base/memory/weak_ptr.h"

#include "base/platform_file.h"

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

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

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

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

#include "googleurl/src/gurl.h"

@@ -97,7 +97,7 @@ class GDataUploader : public GDataUploaderInterface {

// DriveService callback for InitiateUpload.

void OnUploadLocationReceived(int upload_id,

- GDataErrorCode code,

+ DriveErrorCode code,

const GURL& upload_location);

// Uploads the next chunk of data from the file.

@@ -121,7 +121,7 @@ class GDataUploader : public GDataUploaderInterface {

// Handle failed uploads.

void UploadFailed(scoped_ptr<UploadFileInfo> upload_file_info,

- GDataFileError error);

+ DriveFileError error);

// Removes |upload_id| from UploadFileInfoMap |pending_uploads_|.

// Note that this does not delete the UploadFileInfo object itself,