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

Unified Diff: chrome/browser/chromeos/file_system_provider/provided_file_system.h

Issue 440653003: [fsp] Add support for aborting running operations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed DCHECKs. Created 6 years, 4 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/file_system_provider/provided_file_system.h
diff --git a/chrome/browser/chromeos/file_system_provider/provided_file_system.h b/chrome/browser/chromeos/file_system_provider/provided_file_system.h
index 95fc33d41e7bef5bcc25c04a0dec43e226cd72eb..b2fc735000e6e2a531695332f4d9f27aa0302ae8 100644
--- a/chrome/browser/chromeos/file_system_provider/provided_file_system.h
+++ b/chrome/browser/chromeos/file_system_provider/provided_file_system.h
@@ -39,49 +39,51 @@ class ProvidedFileSystem : public ProvidedFileSystemInterface {
virtual ~ProvidedFileSystem();
// ProvidedFileSystemInterface overrides.
- virtual void RequestUnmount(
+ virtual AbortCallback RequestUnmount(
const fileapi::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
- virtual void GetMetadata(const base::FilePath& entry_path,
- const GetMetadataCallback& callback) OVERRIDE;
- virtual void ReadDirectory(
+ virtual AbortCallback GetMetadata(
+ const base::FilePath& entry_path,
+ const GetMetadataCallback& callback) OVERRIDE;
+ virtual AbortCallback ReadDirectory(
const base::FilePath& directory_path,
const fileapi::AsyncFileUtil::ReadDirectoryCallback& callback) OVERRIDE;
- virtual void OpenFile(const base::FilePath& file_path,
- OpenFileMode mode,
- const OpenFileCallback& callback) OVERRIDE;
- virtual void CloseFile(
+ virtual AbortCallback OpenFile(const base::FilePath& file_path,
+ OpenFileMode mode,
+ const OpenFileCallback& callback) OVERRIDE;
+ virtual AbortCallback CloseFile(
int file_handle,
const fileapi::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
- virtual void ReadFile(int file_handle,
- net::IOBuffer* buffer,
- int64 offset,
- int length,
- const ReadChunkReceivedCallback& callback) OVERRIDE;
- virtual void CreateDirectory(
+ virtual AbortCallback ReadFile(
+ int file_handle,
+ net::IOBuffer* buffer,
+ int64 offset,
+ int length,
+ const ReadChunkReceivedCallback& callback) OVERRIDE;
+ virtual AbortCallback CreateDirectory(
const base::FilePath& directory_path,
bool exclusive,
bool recursive,
const fileapi::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
- virtual void DeleteEntry(
+ virtual AbortCallback DeleteEntry(
const base::FilePath& entry_path,
bool recursive,
const fileapi::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
- virtual void CreateFile(
+ virtual AbortCallback CreateFile(
const base::FilePath& file_path,
const fileapi::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
- virtual void CopyEntry(
+ virtual AbortCallback CopyEntry(
const base::FilePath& source_path,
const base::FilePath& target_path,
const fileapi::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
- virtual void MoveEntry(
+ virtual AbortCallback MoveEntry(
const base::FilePath& source_path,
const base::FilePath& target_path,
const fileapi::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
- virtual void Truncate(
+ virtual AbortCallback Truncate(
const base::FilePath& file_path,
int64 length,
const fileapi::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
- virtual void WriteFile(
+ virtual AbortCallback WriteFile(
int file_handle,
net::IOBuffer* buffer,
int64 offset,
@@ -92,13 +94,19 @@ class ProvidedFileSystem : public ProvidedFileSystemInterface {
virtual base::WeakPtr<ProvidedFileSystemInterface> GetWeakPtr() OVERRIDE;
private:
+ // Aborts an operation executed with a request id equal to
+ // |operation_request_id|. The request is removed immediately on the C++ side
+ // despite being handled by the providing extension or not.
+ void Abort(int operation_request_id,
+ const fileapi::AsyncFileUtil::StatusCallback& callback);
+
Profile* profile_; // Not owned.
extensions::EventRouter* event_router_; // Not owned. May be NULL.
ProvidedFileSystemInfo file_system_info_;
scoped_ptr<NotificationManagerInterface> notification_manager_;
RequestManager request_manager_;
- base::WeakPtrFactory<ProvidedFileSystemInterface> weak_ptr_factory_;
+ base::WeakPtrFactory<ProvidedFileSystem> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(ProvidedFileSystem);
};

Powered by Google App Engine
This is Rietveld 408576698