| Index: chrome/browser/chromeos/extensions/file_browser_private_api.h
|
| diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.h b/chrome/browser/chromeos/extensions/file_browser_private_api.h
|
| index 2a80e1ed197828429a36c977bd1bbe528060d41f..09dbe686d5fe7b35ff388b025fc7cbc095b6eb3d 100644
|
| --- a/chrome/browser/chromeos/extensions/file_browser_private_api.h
|
| +++ b/chrome/browser/chromeos/extensions/file_browser_private_api.h
|
| @@ -15,7 +15,7 @@
|
| #include "base/platform_file.h"
|
| #include "chrome/browser/chromeos/extensions/file_browser_event_router.h"
|
| #include "chrome/browser/chromeos/gdata/drive_cache.h"
|
| -#include "chrome/browser/chromeos/gdata/gdata_errorcode.h"
|
| +#include "chrome/browser/chromeos/gdata/drive_errorcode.h"
|
| #include "chrome/browser/extensions/extension_function.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "googleurl/src/url_util.h"
|
| @@ -282,7 +282,7 @@ class AddMountFunction : public FileBrowserFunction {
|
| // A callback method to handle the result of SetMountedState.
|
| void OnMountedStateSet(const std::string& mount_type,
|
| const FilePath::StringType& file_name,
|
| - gdata::GDataFileError error,
|
| + gdata::DriveFileError error,
|
| const FilePath& file_path);
|
| };
|
|
|
| @@ -354,9 +354,9 @@ class GetSizeStatsFunction : public FileBrowserFunction {
|
| // GetLocalPathsOnFileThreadAndRunCallbackOnUIThread.
|
| void GetLocalPathsResponseOnUIThread(const SelectedFileInfoList& files);
|
|
|
| - void GetGDataAvailableSpaceCallback(gdata::GDataFileError error,
|
| - int64 bytes_total,
|
| - int64 bytes_used);
|
| + void GetGDataAvailableSpaceCallback(gdata::DriveFileError error,
|
| + int64 bytes_total,
|
| + int64 bytes_used);
|
|
|
| void GetSizeStatsCallbackOnUIThread(size_t total_size_kb,
|
| size_t remaining_size_kb);
|
| @@ -423,7 +423,7 @@ class FileDialogStringsFunction : public SyncExtensionFunction {
|
| // Retrieve property information for multiple files, returning a list of the
|
| // same length as the input list of file URLs. If a particular file has an
|
| // error, then return a dictionary with the key "error" set to the error number
|
| -// (gdata::GDataFileError) for that entry in the returned list.
|
| +// (gdata::DriveFileError) for that entry in the returned list.
|
| class GetGDataFilePropertiesFunction : public FileBrowserFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION_NAME("fileBrowserPrivate.getGDataFileProperties");
|
| @@ -444,7 +444,7 @@ class GetGDataFilePropertiesFunction : public FileBrowserFunction {
|
|
|
| void OnOperationComplete(const FilePath& file_path,
|
| base::DictionaryValue* properties,
|
| - gdata::GDataFileError error,
|
| + gdata::DriveFileError error,
|
| scoped_ptr<gdata::DriveEntryProto> entry_proto);
|
|
|
| // AsyncExtensionFunction overrides.
|
| @@ -456,7 +456,7 @@ class GetGDataFilePropertiesFunction : public FileBrowserFunction {
|
| private:
|
| void OnGetFileInfo(const FilePath& file_path,
|
| base::DictionaryValue* property_dict,
|
| - gdata::GDataFileError error,
|
| + gdata::DriveFileError error,
|
| scoped_ptr<gdata::DriveEntryProto> entry_proto);
|
|
|
| void CacheStateReceived(base::DictionaryValue* property_dict,
|
| @@ -472,7 +472,7 @@ class GetGDataFilePropertiesFunction : public FileBrowserFunction {
|
| // properties with the updated cache state. The returned array is the
|
| // same length as the input list of file URLs. If a particular file
|
| // has an error, then return a dictionary with the key "error" set to
|
| -// the error number (gdata::GDataFileError) for that entry in the
|
| +// the error number (gdata::DriveFileError) for that entry in the
|
| // returned list.
|
| class PinGDataFileFunction : public GetGDataFilePropertiesFunction {
|
| public:
|
| @@ -497,7 +497,7 @@ class PinGDataFileFunction : public GetGDataFilePropertiesFunction {
|
| void OnPinStateSet(const FilePath& path,
|
| base::DictionaryValue* properties,
|
| scoped_ptr<gdata::DriveEntryProto> entry_proto,
|
| - gdata::GDataFileError error,
|
| + gdata::DriveFileError error,
|
| const std::string& resource_id,
|
| const std::string& md5);
|
|
|
| @@ -557,7 +557,7 @@ class GetGDataFilesFunction : public FileBrowserFunction {
|
|
|
| // Called by GDataFileSystem::GetFile(). Pops the file from
|
| // |remaining_gdata_paths_|, and calls GetFileOrSendResponse().
|
| - void OnFileReady(gdata::GDataFileError error,
|
| + void OnFileReady(gdata::DriveFileError error,
|
| const FilePath& local_path,
|
| const std::string& unused_mime_type,
|
| gdata::DriveFileType file_type);
|
| @@ -618,7 +618,7 @@ class TransferFileFunction : public FileBrowserFunction {
|
| void GetLocalPathsResponseOnUIThread(const SelectedFileInfoList& files);
|
|
|
| // Helper callback for handling response from GDataFileSystem::TransferFile().
|
| - void OnTransferCompleted(gdata::GDataFileError error);
|
| + void OnTransferCompleted(gdata::DriveFileError error);
|
| };
|
|
|
| // Read setting value.
|
| @@ -660,7 +660,7 @@ class SearchDriveFunction : public AsyncExtensionFunction {
|
| const std::string& file_system_name,
|
| const GURL& file_system_url);
|
| // Callback for gdata::SearchAsync called after file system is opened.
|
| - void OnSearch(gdata::GDataFileError error,
|
| + void OnSearch(gdata::DriveFileError error,
|
| const GURL& next_feed,
|
| scoped_ptr<std::vector<gdata::SearchResultInfo> > result_paths);
|
|
|
|
|