gdata: Add GDataDirectoryService::AddEntryToDirectory()

chrome/browser/chromeos/gdata/gdata_files.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_FILES_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILES_H_
 
 #include <map>
 #include <string>
 
@@ skipping 46 matching lines @@
 const FilePath::CharType kGDataRootDirectory[] = FILE_PATH_LITERAL("drive");
 
 // The resource ID for the root directory is defined in the spec:
 // https://developers.google.com/google-apps/documents-list/
 const char kGDataRootDirectoryResourceId[] = "folder:root";
 
 // This should be incremented when incompatibility change is made in
 // gdata.proto.
 const int32 kProtoVersion = 1;
 
+// Used for file operations like removing files.
+typedef base::Callback<void(GDataFileError error)>
+    FileOperationCallback;
+
 // Base class for representing files and directories in gdata virtual file
 // system.
 class GDataEntry {
  public:
   GDataEntry(GDataDirectory* parent, GDataDirectoryService* directory_service);
   virtual ~GDataEntry();
 
   virtual GDataFile* AsGDataFile();
   virtual GDataDirectory* AsGDataDirectory();
 
@@ skipping 191 matching lines @@
   // Converts DocumentEntry into GDataEntry.
   static GDataEntry* FromDocumentEntry(
       GDataDirectory* parent,
       DocumentEntry* doc,
       GDataDirectoryService* directory_service);
 
   // Converts to/from proto.
   bool FromProto(const GDataDirectoryProto& proto) WARN_UNUSED_RESULT;
   void ToProto(GDataDirectoryProto* proto) const;
 
-  // Adds child file to the directory and takes over the ownership of |file|
-  // object. The method will also do name de-duplication to ensure that the
-  // exposed presentation path does not have naming conflicts. Two files with
-  // the same name "Foo" will be renames to "Foo (1)" and "Foo (2)".
-  void AddEntry(GDataEntry* entry);
-
   // Takes the ownership of |entry| from its current parent. If this directory
   // is already the current parent of |file|, this method effectively goes
   // through the name de-duplication for |file| based on the current state of
   // the file system.
   bool TakeEntry(GDataEntry* entry);
 
   // Takes over all entries from |dir|.
   bool TakeOverEntries(GDataDirectory* dir);
 
   // Removes the entry from its children list and destroys the entry instance.
   bool RemoveEntry(GDataEntry* entry);
 
   // Removes child elements.
   void RemoveChildren();
   void RemoveChildFiles();
   void RemoveChildDirectories();
 
   // Collection of children files/directories.
   const GDataFileCollection& child_files() const { return child_files_; }
   const GDataDirectoryCollection& child_directories() const {
     return child_directories_;
   }
 
  private:
+  // TODO(satorux): Remove the friend statements. crbug.com/139649
   friend class GDataDirectoryService;
+  friend class GDataFileSystem;
+
+  // Adds child file to the directory and takes over the ownership of |file|
+  // object. The method will also do name de-duplication to ensure that the
+  // exposed presentation path does not have naming conflicts. Two files with
+  // the same name "Foo" will be renames to "Foo (1)" and "Foo (2)".
+  // TODO(satorux): Remove this. crbug.com/139649
+  void AddEntry(GDataEntry* entry);
 
   // Find a child by its name.
   // TODO(satorux): Remove this. crbug.com/139649
   GDataEntry* FindChild(const FilePath::StringType& file_name) const;
 
   // Add |entry| to children.
   void AddChild(GDataEntry* entry);
 
   // Removes the entry from its children without destroying the
   // entry instance.
@@ skipping 26 matching lines @@
 
   // Largest change timestamp that was the source of content for the current
   // state of the root directory.
   const int largest_changestamp() const { return largest_changestamp_; }
   void set_largest_changestamp(int value) { largest_changestamp_ = value; }
 
   // The root directory content origin.
   const ContentOrigin origin() const { return origin_; }
   void set_origin(ContentOrigin value) { origin_ = value; }
 
+  // ...

[achuithb, 2012/07/31 00:06:52]

I'm assuming comment is coming?

[satorux1, 2012/07/31 00:28:30]

yes. sorry!

[satorux1, 2012/07/31 07:13:22]

Done.

+  void AddEntryAt(const FilePath& path, GDataEntry* entry,

[achuithb, 2012/07/31 00:06:52]

Can we rename |path| to something more descriptive like parent_directory?

Why not just take GDataDirectory* instead?

[satorux1, 2012/07/31 00:28:30]

Will change it to directory_path
GDataEntry/GDataFile/GDataDirectory* will be gone, so I'm minimizing the use of
these for API. GDataEntry* here was not avoidable here for now. 

[satorux1, 2012/07/31 07:13:22]

Done. Renamed it to AddEntryToDirectory() as well

+                  const FileOperationCallback& callback);
+
   // Adds the entry to resource map.
   void AddEntryToResourceMap(GDataEntry* entry);
 
   // Removes the entry from resource map.
   void RemoveEntryFromResourceMap(GDataEntry* entry);
 
   // Searches for |file_path| synchronously.
   // TODO(satorux): Replace this with an async version crbug.com/137160
   GDataEntry* FindEntryByPathSync(const FilePath& file_path);
 
   // Returns the GDataEntry* with the corresponding |resource_id|.
   // TODO(achuith): Get rid of this in favor of async version crbug.com/13957.
   GDataEntry* GetEntryByResourceId(const std::string& resource_id);
 
   // Returns the GDataEntry* in the callback with the corresponding
   // |resource_id|. TODO(achuith): Rename this to GetEntryByResourceId.
   void GetEntryByResourceIdAsync(const std::string& resource_id,
                                  const GetEntryByResourceIdCallback& callback);
 
   // Replaces file entry with the same resource id as |fresh_file| with its
   // fresh value |fresh_file|.
   void RefreshFile(scoped_ptr<GDataFile> fresh_file);
 
+  // Replaces file entry |old_entry| with its fresh value |fresh_file|.
+  static void RefreshFileInternal(scoped_ptr<GDataFile> fresh_file,

[achuithb, 2012/07/31 00:06:52]

Why is this moved from anon namespace?

[satorux1, 2012/07/31 00:28:30]

so that GDataDirectory::AddEntry() can be called.

+                                  GDataEntry* old_entry);
+
   // Serializes/Parses to/from string via proto classes.
   void SerializeToString(std::string* serialized_proto) const;
   bool ParseFromString(const std::string& serialized_proto);
 
  private:
   // A map table of file's resource string to its GDataFile* entry.
   typedef std::map<std::string, GDataEntry*> ResourceMap;
 
   scoped_ptr<GDataDirectory> root_;  // Stored in the serialized proto.
   ResourceMap resource_map_;
 
   base::Time last_serialized_;
   size_t serialized_size_;
   int largest_changestamp_;  // Stored in the serialized proto.
   ContentOrigin origin_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataDirectoryService);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILES_H_