Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / fileapi / external_file_url_request_job.h

diff --git a/src/chrome/browser/chromeos/fileapi/external_file_url_request_job.h b/src/chrome/browser/chromeos/fileapi/external_file_url_request_job.h
index aa99c7e..ea5ab93 100644 (file)
--- a/src/chrome/browser/chromeos/fileapi/external_file_url_request_job.h
+++ b/src/chrome/browser/chromeos/fileapi/external_file_url_request_job.h
@@ -29,15 +29,29 @@ namespace chromeos {
 // requests for drive resources and FileSystem.  It exposes content URLs
 // formatted as drive:<drive-file-path>.
 // The methods should be run on IO thread.
+// TODO(hirono): After removing MHTML support, stop to use the special
+// externalfile: scheme and use filesystem: URL directly.  crbug.com/415455
 class ExternalFileURLRequestJob : public net::URLRequestJob {
  public:
+  // Scope of isolated file system.
+  class IsolatedFileSystemScope {
+   public:
+    explicit IsolatedFileSystemScope(const std::string& file_system_id);
+    ~IsolatedFileSystemScope();
+
+   private:
+    std::string file_system_id_;
+    DISALLOW_COPY_AND_ASSIGN(IsolatedFileSystemScope);
+  };
+
   // Callback to take results from an internal helper defined in
   // drive_url_request_job.cc.
-  typedef base::Callback<
-      void(net::Error,
-           const scoped_refptr<storage::FileSystemContext>& file_system_context,
-           const storage::FileSystemURL& file_system_url,
-           const std::string& mime_type)> HelperCallback;
+  typedef base::Callback<void(
+      net::Error,
+      const scoped_refptr<storage::FileSystemContext>& file_system_context,
+      scoped_ptr<IsolatedFileSystemScope> isolated_file_system_scope,
+      const storage::FileSystemURL& file_system_url,
+      const std::string& mime_type)> HelperCallback;
 
   ExternalFileURLRequestJob(void* profile_id,
                             net::URLRequest* request,
@@ -45,15 +59,15 @@ class ExternalFileURLRequestJob : public net::URLRequestJob {
 
   // net::URLRequestJob overrides:
   virtual void SetExtraRequestHeaders(
-      const net::HttpRequestHeaders& headers) OVERRIDE;
-  virtual void Start() OVERRIDE;
-  virtual void Kill() OVERRIDE;
-  virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
+      const net::HttpRequestHeaders& headers) override;
+  virtual void Start() override;
+  virtual void Kill() override;
+  virtual bool GetMimeType(std::string* mime_type) const override;
   virtual bool IsRedirectResponse(GURL* location,
-                                  int* http_status_code) OVERRIDE;
+                                  int* http_status_code) override;
   virtual bool ReadRawData(net::IOBuffer* buf,
                            int buf_size,
-                           int* bytes_read) OVERRIDE;
+                           int* bytes_read) override;
 
  protected:
   virtual ~ExternalFileURLRequestJob();
@@ -64,6 +78,7 @@ class ExternalFileURLRequestJob : public net::URLRequestJob {
   void OnHelperResultObtained(
       net::Error error,
       const scoped_refptr<storage::FileSystemContext>& file_system_context,
+      scoped_ptr<IsolatedFileSystemScope> isolated_file_system_scope,
       const storage::FileSystemURL& file_system_url,
       const std::string& mime_type);
 
@@ -84,6 +99,7 @@ class ExternalFileURLRequestJob : public net::URLRequestJob {
   int64 remaining_bytes_;
 
   scoped_refptr<storage::FileSystemContext> file_system_context_;
+  scoped_ptr<IsolatedFileSystemScope> isolated_file_system_scope_;
   storage::FileSystemURL file_system_url_;
   std::string mime_type_;
   scoped_ptr<storage::FileStreamReader> stream_reader_;