AddEntryToDirectory now takes a FilePath and scoped_ptr<DocumentEntry>

chrome/browser/chromeos/gdata/drive_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_DRIVE_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 98 matching lines @@
       const FilePath& file_path,
       const GetEntryInfoCallback& callback) OVERRIDE;
   virtual void ReadDirectoryByPath(
       const FilePath& file_path,
       const ReadDirectoryWithSettingCallback& callback) OVERRIDE;
   virtual void RequestDirectoryRefresh(
       const FilePath& file_path) OVERRIDE;
   virtual void GetAvailableSpace(
       const GetAvailableSpaceCallback& callback) OVERRIDE;
   virtual void AddUploadedFile(UploadMode upload_mode,
-                               const FilePath& virtual_dir_path,
-                               scoped_ptr<DocumentEntry> entry,
+                               const FilePath& directory_path,
+                               scoped_ptr<DocumentEntry> doc_entry,
                                const FilePath& file_content_path,
                                DriveCache::FileOperationType cache_operation,
                                const base::Closure& callback) OVERRIDE;
   virtual void UpdateEntryData(const std::string& resource_id,
                                const std::string& md5,
                                scoped_ptr<DocumentEntry> entry,
                                const FilePath& file_content_path,
                                const base::Closure& callback) OVERRIDE;
 
   // content::NotificationObserver implementation.
@@ skipping 27 matching lines @@
     // Target directory found, it's not a directory.
     FOUND_INVALID,
     // Found missing directory segment while searching for given directory.
     FOUND_MISSING,
     // Found target directory, it already exists.
     DIRECTORY_ALREADY_PRESENT,
   };
 
   // Defines set of parameters passes to intermediate callbacks during
   // execution of CreateDirectory() method.
-  struct CreateDirectoryParams;
+  struct CreateDirectoryParams {

[hashimoto, 2012/08/27 20:36:41]

Hmm, I'd like to keep this in .cc file but test code needs it…

+    CreateDirectoryParams(const FilePath& created_directory_path,
+                          const FilePath& target_directory_path,
+                          bool is_exclusive,
+                          bool is_recursive,
+                          const FileOperationCallback& callback);
+    ~CreateDirectoryParams();
+
+    const FilePath created_directory_path;
+    const FilePath target_directory_path;
+    const bool is_exclusive;
+    const bool is_recursive;
+    FileOperationCallback callback;
+  };
 
   // Defines set of parameters passed to an intermediate callback
   // OnGetFileCompleteForOpen, during execution of OpenFile() method.
   struct GetFileCompleteForOpenParams;
 
   // Defines set of parameters passed to intermediate callbacks during
   // execution of GetFileByPath() method.
   struct GetFileFromCacheParams;
 
   // Struct used for StartFileUploadOnUIThread().
@@ skipping 165 matching lines @@
   // name is uniquified by adding a parenthesized serial number like
   // "foo (2).txt"
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
   // |callback| must not be null.
   void Rename(const FilePath& file_path,
               const FilePath::StringType& new_name,
               const FileMoveCallback& callback);
 
   // Part of Rename(). Called after GetEntryInfoByPath() is complete.
+  // |callback| must not be null.
   void RenameAfterGetEntryInfo(const FilePath& file_path,
                                const FilePath::StringType& new_name,
                                const FileMoveCallback& callback,
                                DriveFileError error,
                                scoped_ptr<DriveEntryProto> entry_proto);
 
   // 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.
   //
@@ skipping 66 matching lines @@
   // 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,
                           GDataErrorCode status,
                           scoped_ptr<base::Value> data);
 
-  // Callback for handling directory create requests.
-  void OnCreateDirectoryCompleted(const CreateDirectoryParams& params,
-                                  GDataErrorCode status,
-                                  scoped_ptr<base::Value> created_entry);
+  // Callback for handling directory create requests. Adds the directory
+  // represented by |created_entry| to the local filesystem.
+  void AddNewDirectory(const CreateDirectoryParams& params,
+                       GDataErrorCode status,
+                       scoped_ptr<base::Value> created_entry);
+
+  // Callback for DriveResourceMetadata::AddEntryToDirectory. Continues the
+  // recursive creation of a directory path by calling CreateDirectory again.
+  void ContinueCreateDirectory(
+      const CreateDirectoryParams& params,
+      DriveFileError error,
+      const FilePath& moved_file_path);
 
   // Callback for handling file downloading requests.
   void OnFileDownloaded(const GetFileFromCacheParams& params,
                         GDataErrorCode status,
                         const GURL& content_url,
                         const FilePath& downloaded_file_path);
 
   // Unpins file if cache entry is pinned.
   void UnpinIfPinned(const std::string& resource_id,
                      const std::string& md5,
@@ skipping 36 matching lines @@
   // Callback for DriveServiceInterface::DeleteDocument. Removes the entry with
   // |resource_id| from the local snapshot of the filesystem and the cache.
   // |document_url| is unused. |callback| may be null.
   void RemoveResourceLocally(const FileOperationCallback& callback,
                              const std::string& resource_id,
                              GDataErrorCode status,
                              const GURL& document_url);
 
   // Callback when an entry is moved to another directory on the client side.
   // Notifies the directory change and runs |callback|.
-  // |callback| may be null.
+  // |callback| must not be null.
   void NotifyAndRunFileMoveCallback(
       const FileMoveCallback& callback,
       DriveFileError error,
       const FilePath& moved_file_path);
 
   // Callback when an entry is moved to another directory on the client side.
   // Notifies the directory change and runs |callback|.
   // |callback| must not be null.
   void NotifyAndRunFileOperationCallback(
       const FileOperationCallback& callback,
@@ skipping 10 matching lines @@
   // Continues to add an uploaded file after existing entry has been deleted.
   void ContinueAddUploadedFile(AddUploadedFileParams* params,
                                DriveFileError error,
                                const FilePath& file_path);
 
   // Adds the uploaded file to the cache.
   void AddUploadedFileToCache(AddUploadedFileParams* params,
                               DriveFileError error,
                               const FilePath& file_path);
 
-  // Converts |entry_value| into GFileDocument instance and adds it
-  // to virtual file system at |directory_path|.
-  DriveFileError AddNewDirectory(const FilePath& directory_path,
-                                 base::Value* entry_value);
-
   // Given non-existing |directory_path|, finds the first missing parent
   // directory of |directory_path|.
   FindMissingDirectoryResult FindFirstMissingParentDirectory(
       const FilePath& directory_path,
       GURL* last_dir_content_url,
       FilePath* first_missing_parent_path);
 
   // Callback for handling results of ReloadFeedFromServerIfNeeded() initiated
   // from CheckForUpdates(). This callback checks whether feed is successfully
   // reloaded, and in case of failure, restores the content origin of the root
@@ skipping 200 matching lines @@
       const GetEntryInfoWithFilePathCallback& callback);
   void ReadDirectoryByPathOnUIThread(
       const FilePath& file_path,
       const ReadDirectoryWithSettingCallback& callback);
   void RequestDirectoryRefreshOnUIThread(const FilePath& file_path);
   void OnRequestDirectoryRefresh(const FilePath& directory_path,
                                  GetDocumentsParams* params,
                                  DriveFileError error);
   void GetAvailableSpaceOnUIThread(const GetAvailableSpaceCallback& callback);
   void AddUploadedFileOnUIThread(UploadMode upload_mode,
-                                 const FilePath& virtual_dir_path,
-                                 scoped_ptr<DocumentEntry> entry,
+                                 const FilePath& directory_path,
+                                 scoped_ptr<DocumentEntry> doc_entry,
                                  const FilePath& file_content_path,
                                  DriveCache::FileOperationType cache_operation,
                                  const base::Closure& callback);
   void UpdateEntryDataOnUIThread(const std::string& resource_id,
                                  const std::string& md5,
                                  scoped_ptr<DocumentEntry> entry,
                                  const FilePath& file_content_path,
                                  const base::Closure& callback);
 
   // Part of CopyOnUIThread(). Called after GetEntryInfoPairByPaths() is
@@ skipping 90 matching lines @@
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<DriveFileSystem> 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<DriveFileSystem> ui_weak_ptr_;
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_H_