| Index: chrome/browser/chromeos/drive/file_system/move_operation.h
|
| diff --git a/chrome/browser/chromeos/drive/file_system/move_operation.h b/chrome/browser/chromeos/drive/file_system/move_operation.h
|
| index cf951669f4faadcec0a2bed24d4ccfe54d66ff1d..917222251d9d5e02a8b995a2c5de872f8018bfda 100644
|
| --- a/chrome/browser/chromeos/drive/file_system/move_operation.h
|
| +++ b/chrome/browser/chromeos/drive/file_system/move_operation.h
|
| @@ -89,13 +89,13 @@ class MoveOperation {
|
| //
|
| // Can be called from UI thread. |callback| is run on the calling thread.
|
| // |callback| must not be null.
|
| - void RemoveEntryFromNonRootDirectory(const FileMoveCallback& callback,
|
| - DriveFileError error,
|
| - const FilePath& file_path);
|
| + void RemoveEntryFromDirectory(const FileMoveCallback& callback,
|
| + DriveFileError error,
|
| + const FilePath& file_path);
|
|
|
| - // Part of RemoveEntryFromNonRootDirectory(). Called after
|
| + // Part of RemoveEntryFromDirectory(). Called after
|
| // GetEntryInfoPairByPaths() is complete. |callback| must not be null.
|
| - void RemoveEntryFromNonRootDirectoryAfterEntryInfoPair(
|
| + void RemoveEntryFromDirectoryAfterEntryInfoPair(
|
| const FileMoveCallback& callback,
|
| scoped_ptr<EntryInfoPairResult> result);
|
|
|
| @@ -105,14 +105,14 @@ class MoveOperation {
|
| //
|
| // Can be called from UI thread. |callback| is run on the calling thread.
|
| // |callback| must not be null.
|
| - void MoveEntryFromRootDirectory(const FilePath& directory_path,
|
| - const FileOperationCallback& callback,
|
| - DriveFileError error,
|
| - const FilePath& file_path);
|
| + void AddEntryToDirectory(const FilePath& directory_path,
|
| + const FileOperationCallback& callback,
|
| + DriveFileError error,
|
| + const FilePath& file_path);
|
|
|
| - // Part of MoveEntryFromRootDirectory(). Called after
|
| + // Part of AddEntryToDirectory(). Called after
|
| // GetEntryInfoPairByPaths() is complete. |callback| must not be null.
|
| - void MoveEntryFromRootDirectoryAfterGetEntryInfoPair(
|
| + void AddEntryToDirectoryAfterGetEntryInfoPair(
|
| const FileOperationCallback& callback,
|
| scoped_ptr<EntryInfoPairResult> result);
|
|
|
|
|