gdata: Add GDataDirectoryService::AddEntryToDirectory()

chrome/browser/chromeos/gdata/gdata_file_system.cc

 // 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.
 
 #include "chrome/browser/chromeos/gdata/gdata_file_system.h"
 
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 136 matching lines @@
   for (GDataDirectoryCollection::const_iterator it =
        dir->child_directories().begin();
        it != dir->child_directories().end(); ++it) {
     GDataDirectory* child_dir = it->second;
     changed_dirs->insert(child_dir->GetFilePath());
     GetChildDirectoryPaths(child_dir, changed_dirs);
   }
 }
 
 
-// Helper function for removing |entry| from |directory|. If |entry| is a
-// directory too, it will collect all its children file paths into
-// |changed_dirs| as well.
-void RemoveEntryFromDirectoryAndCollectChangedDirectories(
-    GDataDirectory* directory,
-    GDataEntry* entry,
-    std::set<FilePath>* changed_dirs) {
-  // Get the list of all sub-directory paths, so we can notify their listeners
-  // that they are smoked.
-  GetChildDirectoryPaths(entry, changed_dirs);
-  directory->RemoveEntry(entry);
-}
-
-// Helper function for adding new |file| from the feed into |directory|. It
-// checks the type of file and updates |changed_dirs| if this file adding
-// operation needs to raise directory notification update. If file is being
-// added to |orphaned_dir_service| such notifications are not raised since
-// we ignore such files and don't add them to the file system now.
-void AddEntryToDirectoryAndCollectChangedDirectories(
-    GDataEntry* entry,
-    GDataDirectory* directory,
-    GDataDirectoryService* orphaned_dir_service,
-    std::set<FilePath>* changed_dirs) {
-  directory->AddEntry(entry);
-  if (entry->AsGDataDirectory() && directory != orphaned_dir_service->root())
-    changed_dirs->insert(entry->GetFilePath());
-}
-
 // Invoked upon completion of TransferRegularFile initiated by Copy.
 //
 // |callback| is run on the thread represented by |relay_proxy|.
 void OnTransferRegularFileCompleteForCopy(
     const FileOperationCallback& callback,
     scoped_refptr<base::MessageLoopProxy> relay_proxy,
     GDataFileError error) {
   if (!callback.is_null())
     relay_proxy->PostTask(FROM_HERE, base::Bind(callback, error));
 }
@@ skipping 3277 matching lines @@
   DCHECK(file_map->empty());
 
   if (should_notify_directory_changed) {
     for (std::set<FilePath>::iterator dir_iter = changed_dirs.begin();
         dir_iter != changed_dirs.end(); ++dir_iter) {
       NotifyDirectoryChanged(*dir_iter);
     }
   }
 }
 
+// Helper function for adding new |file| from the feed into |directory|. It
+// checks the type of file and updates |changed_dirs| if this file adding
+// operation needs to raise directory notification update. If file is being
+// added to |orphaned_dir_service| such notifications are not raised since
+// we ignore such files and don't add them to the file system now.
+// static
+void GDataFileSystem::AddEntryToDirectoryAndCollectChangedDirectories(
+    GDataEntry* entry,
+    GDataDirectory* directory,
+    GDataDirectoryService* orphaned_dir_service,
+    std::set<FilePath>* changed_dirs) {
+  directory->AddEntry(entry);
+  if (entry->AsGDataDirectory() && directory != orphaned_dir_service->root())
+    changed_dirs->insert(entry->GetFilePath());
+}
+
+// Helper function for removing |entry| from |directory|. If |entry| is a
+// directory too, it will collect all its children file paths into
+// |changed_dirs| as well.
+// static
+void GDataFileSystem::RemoveEntryFromDirectoryAndCollectChangedDirectories(
+    GDataDirectory* directory,
+    GDataEntry* entry,
+    std::set<FilePath>* changed_dirs) {
+  // Get the list of all sub-directory paths, so we can notify their listeners
+  // that they are smoked.
+  GetChildDirectoryPaths(entry, changed_dirs);
+  directory->RemoveEntry(entry);
+}
+
 GDataDirectory* GDataFileSystem::FindDirectoryForNewEntry(
     GDataEntry* new_entry,
     const FileResourceIdMap& file_map,
     GDataDirectoryService* orphaned_dir_service) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   GDataDirectory* dir = NULL;
   // Added file.
   const std::string& parent_id = new_entry->parent_resource_id();
   if (parent_id.empty()) {
     dir = directory_service_->root();
@@ skipping 775 matching lines @@
   }
 
   PlatformFileInfoProto entry_file_info;
   GDataEntry::ConvertPlatformFileInfoToProto(*file_info, &entry_file_info);
   *entry_proto->mutable_file_info() = entry_file_info;
   if (!callback.is_null())
     callback.Run(GDATA_FILE_OK, entry_proto.Pass());
 }
 
 }  // namespace gdata