| Index: chrome/browser/chromeos/gdata/gdata_sync_client.h
|
| diff --git a/chrome/browser/chromeos/gdata/gdata_sync_client.h b/chrome/browser/chromeos/gdata/gdata_sync_client.h
|
| index 3d540df893d7b14a6da14d5185ef732300a5216e..64d4e03f84bae2379e64eebc3b5041c3fbe4669a 100644
|
| --- a/chrome/browser/chromeos/gdata/gdata_sync_client.h
|
| +++ b/chrome/browser/chromeos/gdata/gdata_sync_client.h
|
| @@ -141,7 +141,7 @@ class GDataSyncClient : public GDataFileSystemInterface::Observer,
|
|
|
| // Called when a file entry is obtained.
|
| void OnGetEntryInfoByResourceId(const std::string& resource_id,
|
| - GDataFileError error,
|
| + DriveFileError error,
|
| const FilePath& file_path,
|
| scoped_ptr<DriveEntryProto> entry_proto);
|
|
|
| @@ -152,19 +152,19 @@ class GDataSyncClient : public GDataFileSystemInterface::Observer,
|
| const DriveCacheEntry& cache_entry);
|
|
|
| // Called when an existing cache entry and the local files are removed.
|
| - void OnRemove(GDataFileError error,
|
| + void OnRemove(DriveFileError error,
|
| const std::string& resource_id,
|
| const std::string& md5);
|
|
|
| // Called when a file is pinned.
|
| - void OnPinned(GDataFileError error,
|
| + void OnPinned(DriveFileError error,
|
| const std::string& resource_id,
|
| const std::string& md5);
|
|
|
| // Called when the file for |resource_id| is fetched.
|
| // Calls DoSyncLoop() to go back to the sync loop.
|
| void OnFetchFileComplete(const SyncTask& sync_task,
|
| - GDataFileError error,
|
| + DriveFileError error,
|
| const FilePath& local_path,
|
| const std::string& ununsed_mime_type,
|
| DriveFileType file_type);
|
| @@ -172,7 +172,7 @@ class GDataSyncClient : public GDataFileSystemInterface::Observer,
|
| // Called when the file for |resource_id| is uploaded.
|
| // Calls DoSyncLoop() to go back to the sync loop.
|
| void OnUploadFileComplete(const std::string& resource_id,
|
| - GDataFileError error);
|
| + DriveFileError error);
|
|
|
| // chromeos::NetworkLibrary::NetworkManagerObserver override.
|
| virtual void OnNetworkManagerChanged(
|
|
|