Index: chrome/browser/chromeos/gdata/gdata_file_system.h |
diff --git a/chrome/browser/chromeos/gdata/gdata_file_system.h b/chrome/browser/chromeos/gdata/gdata_file_system.h |
index 1a0950b9a18d86bf738c350f1b942ad66246cb84..49e9579aaa43f9b2373eb452706d44a226c37aef 100644 |
--- a/chrome/browser/chromeos/gdata/gdata_file_system.h |
+++ b/chrome/browser/chromeos/gdata/gdata_file_system.h |
@@ -373,13 +373,16 @@ class GDataFileSystem : public GDataFileSystemInterface, |
GDataFileError error, |
scoped_ptr<GDataEntryProto> entry_proto); |
- // Adds a file or directory at |file_path| to the directory at |dir_path|. |
+ // Moves a file or directory at |file_path| in the root directory to |
+ // another directory at |dir_path|. This function does nothing if |
+ // |dir_path| points to the root directory. |
// |
// Can be called from UI thread. |callback| is run on the calling thread. |
- void AddEntryToDirectory(const FilePath& dir_path, |
- const FileOperationCallback& callback, |
- GDataFileError error, |
- const FilePath& file_path); |
+ // |callback| must not be null. |
+ void MoveEntryFromRootDirectory(const FilePath& dir_path, |
+ const FileOperationCallback& callback, |
+ GDataFileError error, |
+ const FilePath& file_path); |
// Removes a file or directory at |file_path| from the directory at |
// |dir_path| and moves it to the root directory. |
@@ -422,13 +425,15 @@ class GDataFileSystem : public GDataFileSystemInterface, |
GDataErrorCode status, |
scoped_ptr<base::Value> data); |
- // Callback for handling an attempt to add a file or directory to another |
- // directory. |
- void OnAddEntryToDirectoryCompleted(const FileOperationCallback& callback, |
- const FilePath& file_path, |
- const FilePath& dir_path, |
- GDataErrorCode status, |
- const GURL& document_url); |
+ // Callback for handling an attempt to move a file or directory from the |
+ // root directory to another directory. |
achuithb
2012/08/09 21:32:42
Maybe also state that this calls GDataDirectorySer
satorux1
2012/08/09 21:50:54
You meant GDataDirectoryService::MoveEntryToDirec
achuithb
2012/08/09 22:42:34
Yup, sorry.
|
+ // |callback| must not be null. |
+ void OnMoveEntryFromRootDirectoryCompleted( |
+ const FileOperationCallback& callback, |
+ const FilePath& file_path, |
+ const FilePath& dir_path, |
+ GDataErrorCode status, |
+ const GURL& document_url); |
// Callback for handling account metadata fetch. |
void OnGetAvailableSpace( |
@@ -515,6 +520,7 @@ class GDataFileSystem : public GDataFileSystemInterface, |
// Callback for GDataDirectoryService::MoveEntryToDirectory with |
// FileOperationCallback. |
+ // |callback| must not be null. |
void OnMoveEntryToDirectoryWithFileOperationCallback( |
const FileOperationCallback& callback, |
GDataFileError error, |