gdata: Rename AddEntryToDirectory() to MoveEntryFromRootDirectory()

chrome/browser/chromeos/gdata/gdata_file_system.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 355 matching lines @@
               const FilePath::StringType& new_name,
               const FileMoveCallback& callback);
 
   // Part of Rename(). Called after GetEntryInfoByPath() is complete.
   void RenameAfterGetEntryInfo(const FilePath& file_path,
                                const FilePath::StringType& new_name,
                                const FileMoveCallback& callback,
                                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.
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
   void RemoveEntryFromDirectory(const FilePath& dir_path,
                                 const FileMoveCallback& callback,
                                 GDataFileError error,
                                 const FilePath& file_path);
 
@@ skipping 22 matching lines @@
       const std::string& md5,
       const FilePath& cache_file_path);
 
   // Callback for handling document copy attempt.
   // |callback| must not be null.
   void OnCopyDocumentCompleted(const FilePath& dir_path,
                                const FileOperationCallback& callback,
                                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 on the server side. This function
+  // moves |entry| to the root directory on the client side with
+  // GDataDirectoryService::MoveEntryToDirectory().
+  //
+  // |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(
       const GetAvailableSpaceCallback& callback,
       GDataErrorCode status,
       scoped_ptr<base::Value> data);
 
   // Callback for handling Drive V2 about resource fetch.
   void OnGetAboutResource(
       const GetAvailableSpaceCallback& callback,
@@ skipping 66 matching lines @@
 
   // Callback for GDataDirectoryService::MoveEntryToDirectory with
   // FileMoveCallback.
   void OnMoveEntryToDirectoryWithFileMoveCallback(
       const FileMoveCallback& callback,
       GDataFileError error,
       const FilePath& moved_file_path);
 
   // Callback for GDataDirectoryService::MoveEntryToDirectory with
   // FileOperationCallback.
+  // |callback| must not be null.
   void OnMoveEntryToDirectoryWithFileOperationCallback(
       const FileOperationCallback& callback,
       GDataFileError error,
       const FilePath& moved_file_path);
 
   // Callback for GetEntryByResourceIdAsync.
   // Removes stale entry upon upload of file.
   static void RemoveStaleEntryOnUpload(const std::string& resource_id,
                                        GDataDirectory* parent_dir,
                                        GDataEntry* existing_entry);
@@ skipping 312 matching lines @@
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<GDataFileSystem> ui_weak_ptr_factory_;
   // Unlike other classes, we need this as we need this to redirect a task
   // from IO thread to UI thread.
   base::WeakPtr<GDataFileSystem> ui_weak_ptr_;
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_