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

Side by Side Diff: net/url_request/url_request_file_job.h

Issue 10700117: Replaced static URLRequestFileJob factory with non-static protocol handler for File jobs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed merge Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_URL_REQUEST_URL_REQUEST_FILE_JOB_H_ 5 #ifndef NET_URL_REQUEST_URL_REQUEST_FILE_JOB_H_
6 #define NET_URL_REQUEST_URL_REQUEST_FILE_JOB_H_ 6 #define NET_URL_REQUEST_URL_REQUEST_FILE_JOB_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/file_path.h" 11 #include "base/file_path.h"
12 #include "net/base/file_stream.h" 12 #include "net/base/file_stream.h"
13 #include "net/base/net_export.h" 13 #include "net/base/net_export.h"
14 #include "net/http/http_byte_range.h" 14 #include "net/http/http_byte_range.h"
15 #include "net/url_request/url_request.h" 15 #include "net/url_request/url_request.h"
16 #include "net/url_request/url_request_job.h" 16 #include "net/url_request/url_request_job.h"
17 17
18 namespace file_util { 18 namespace file_util {
19 struct FileInfo; 19 struct FileInfo;
20 } 20 }
21 21
22 namespace net { 22 namespace net {
23 23
24 // A request job that handles reading file URLs 24 // A request job that handles reading file URLs
25 class NET_EXPORT URLRequestFileJob : public URLRequestJob { 25 class NET_EXPORT URLRequestFileJob : public URLRequestJob {
26 public: 26 public:
27 URLRequestFileJob(URLRequest* request, const FilePath& file_path); 27 URLRequestFileJob(URLRequest* request,
28 const FilePath& file_path,
29 NetworkDelegate* network_delegate);
28 30
29 static URLRequest::ProtocolFactory Factory; 31 static URLRequest::ProtocolFactory Factory;
30 32
31 #if defined(OS_CHROMEOS) 33 #if defined(OS_CHROMEOS)
32 static bool AccessDisabled(const FilePath& file_path); 34 static bool AccessDisabled(const FilePath& file_path);
33 #endif 35 #endif
34 36
35 // URLRequestJob: 37 // URLRequestJob:
36 virtual void Start() OVERRIDE; 38 virtual void Start() OVERRIDE;
37 virtual void Kill() OVERRIDE; 39 virtual void Kill() OVERRIDE;
(...skipping 11 matching lines...) Expand all
49 virtual ~URLRequestFileJob(); 51 virtual ~URLRequestFileJob();
50 52
51 // The OS-specific full path name of the file 53 // The OS-specific full path name of the file
52 FilePath file_path_; 54 FilePath file_path_;
53 55
54 private: 56 private:
55 // Tests to see if access to |path| is allowed. If g_allow_file_access_ is 57 // Tests to see if access to |path| is allowed. If g_allow_file_access_ is
56 // true, then this will return true. If the NetworkDelegate associated with 58 // true, then this will return true. If the NetworkDelegate associated with
57 // the |request| says it's OK, then this will also return true. 59 // the |request| says it's OK, then this will also return true.
58 static bool IsFileAccessAllowed(const URLRequest& request, 60 static bool IsFileAccessAllowed(const URLRequest& request,
59 const FilePath& path); 61 const FilePath& path,
62 NetworkDelegate* network_delegate);
mmenke 2012/08/15 14:57:16 Since you manually inlined this function, you need
shalev 2012/08/15 21:23:41 Done.
60 63
61 // Callback after fetching file info on a background thread. 64 // Callback after fetching file info on a background thread.
62 void DidResolve(bool exists, const base::PlatformFileInfo& file_info); 65 void DidResolve(bool exists, const base::PlatformFileInfo& file_info);
63 66
64 // Callback after data is asynchronously read from the file. 67 // Callback after data is asynchronously read from the file.
65 void DidRead(int result); 68 void DidRead(int result);
66 69
67 FileStream stream_; 70 FileStream stream_;
68 bool is_directory_; 71 bool is_directory_;
69 72
70 HttpByteRange byte_range_; 73 HttpByteRange byte_range_;
71 int64 remaining_bytes_; 74 int64 remaining_bytes_;
72 75
73 // The initial file metadata is fetched on a background thread. 76 // The initial file metadata is fetched on a background thread.
74 // AsyncResolver runs that task. 77 // AsyncResolver runs that task.
75 class AsyncResolver; 78 class AsyncResolver;
76 friend class AsyncResolver; 79 friend class AsyncResolver;
77 scoped_refptr<AsyncResolver> async_resolver_; 80 scoped_refptr<AsyncResolver> async_resolver_;
78 81
79 DISALLOW_COPY_AND_ASSIGN(URLRequestFileJob); 82 DISALLOW_COPY_AND_ASSIGN(URLRequestFileJob);
80 }; 83 };
81 84
82 } // namespace net 85 } // namespace net
83 86
84 #endif // NET_URL_REQUEST_URL_REQUEST_FILE_JOB_H_ 87 #endif // NET_URL_REQUEST_URL_REQUEST_FILE_JOB_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698