Index: chrome/browser/chromeos/drive/file_system.h |
diff --git a/chrome/browser/chromeos/drive/file_system.h b/chrome/browser/chromeos/drive/file_system.h |
index 40ced62e65ddd96017a7f295a7230ce6557e888e..62880419528335e3308ef637d9e836ff61367302 100644 |
--- a/chrome/browser/chromeos/drive/file_system.h |
+++ b/chrome/browser/chromeos/drive/file_system.h |
@@ -13,7 +13,6 @@ |
#include "base/observer_list.h" |
#include "chrome/browser/chromeos/drive/change_list_loader_observer.h" |
#include "chrome/browser/chromeos/drive/file_system/operation_observer.h" |
-#include "chrome/browser/chromeos/drive/file_system/operations.h" |
#include "chrome/browser/chromeos/drive/file_system_interface.h" |
#include "chrome/browser/chromeos/drive/file_system_util.h" |
#include "chrome/browser/chromeos/drive/job_list.h" |
@@ -44,6 +43,19 @@ class ChangeListLoader; |
class ResourceMetadata; |
} // namespace internal |
+namespace file_system { |
+class CopyOperation; |
+class CreateDirectoryOperation; |
+class CreateFileOperation; |
+class DownloadOperation; |
+class MoveOperation; |
+class OperationObserver; |
+class RemoveOperation; |
+class SearchOperation; |
+class TouchOperation; |
+class UpdateOperation; |
+} // namespace file_system |
+ |
// The production implementation of FileSystemInterface. |
class FileSystem : public FileSystemInterface, |
public internal::ChangeListLoaderObserver, |
@@ -175,6 +187,9 @@ class FileSystem : public FileSystemInterface, |
// Sets up ChangeListLoader. |
void SetupChangeListLoader(); |
+ // Sets up file_system::XXXOperation instances. |
+ void SetupOperations(); |
+ |
// Called on preference change. |
void OnDisableDriveHostedFilesChanged(); |
@@ -367,7 +382,16 @@ class FileSystem : public FileSystemInterface, |
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_; |
- file_system::Operations operations_; |
+ // Implementation of each file system operation. |
+ scoped_ptr<file_system::CopyOperation> copy_operation_; |
+ scoped_ptr<file_system::CreateDirectoryOperation> create_directory_operation_; |
+ scoped_ptr<file_system::CreateFileOperation> create_file_operation_; |
+ scoped_ptr<file_system::MoveOperation> move_operation_; |
+ scoped_ptr<file_system::RemoveOperation> remove_operation_; |
+ scoped_ptr<file_system::TouchOperation> touch_operation_; |
+ scoped_ptr<file_system::DownloadOperation> download_operation_; |
+ scoped_ptr<file_system::UpdateOperation> update_operation_; |
+ scoped_ptr<file_system::SearchOperation> search_operation_; |
// Polling interval for checking updates in seconds. |
int polling_interval_sec_; |