Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(835)

Unified Diff: chrome/browser/chromeos/drive/file_system/open_file_operation.h

Issue 19596003: Remove CloseFile from FileSystem. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/drive/file_system/open_file_operation.h
diff --git a/chrome/browser/chromeos/drive/file_system/open_file_operation.h b/chrome/browser/chromeos/drive/file_system/open_file_operation.h
index 8aea8add44f82c66b595b7d01e5ff6e3995a8c90..f656d2f59addf63de84b794529352d24507f8d16 100644
--- a/chrome/browser/chromeos/drive/file_system/open_file_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/open_file_operation.h
@@ -42,8 +42,7 @@ class OpenFileOperation {
JobScheduler* scheduler,
internal::ResourceMetadata* metadata,
internal::FileCache* cache,
- const base::FilePath& temporary_file_directory,
- std::map<base::FilePath, int>* open_files);
+ const base::FilePath& temporary_file_directory);
~OpenFileOperation();
// Opens the file at |file_path|.
@@ -63,28 +62,30 @@ class OpenFileOperation {
FileError error);
// Part of OpenFile(). Called after file downloading is completed.
- void OpenFileAfterFileDownloaded(const base::FilePath& file_path,
- const OpenFileCallback& callback,
+ void OpenFileAfterFileDownloaded(const OpenFileCallback& callback,
FileError error,
const base::FilePath& local_file_path,
scoped_ptr<ResourceEntry> entry);
// Part of OpenFile(). Called after the updating of the local state.
- void OpenFileAfterUpdateLocalState(const base::FilePath& file_path,
+ void OpenFileAfterUpdateLocalState(const std::string& resource_id,
const OpenFileCallback& callback,
const base::FilePath* local_file_path,
FileError error);
+ // Closes the file with |resource_id|.
+ void CloseFile(const std::string& resource_id);
+
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
+ OperationObserver* observer_;
internal::FileCache* cache_;
scoped_ptr<CreateFileOperation> create_file_operation_;
scoped_ptr<DownloadOperation> download_operation_;
- // The map from paths for opened file to the number how many the file is
- // opened. The instance is owned by FileSystem and shared with
- // CloseFileOperation.
- std::map<base::FilePath, int>* open_files_;
+ // The map from resource id for an opened file to the number how many times
+ // the file is opened.
+ std::map<std::string, int> open_files_;
// Note: This should remain the last member so it'll be destroyed and
// invalidate its weak pointers before any other members are destroyed.

Powered by Google App Engine
This is Rietveld 408576698