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

Side by Side Diff: webkit/fileapi/file_system_url_request_job_factory.cc

Issue 10855209: Refactoring: ProtocolHandler::MaybeCreateJob takes NetworkDelegate as argument (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Latest merge Created 8 years, 3 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 #include "webkit/fileapi/file_system_url_request_job_factory.h" 5 #include "webkit/fileapi/file_system_url_request_job_factory.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "net/url_request/url_request.h" 11 #include "net/url_request/url_request.h"
12 #include "webkit/fileapi/file_system_url_request_job.h" 12 #include "webkit/fileapi/file_system_url_request_job.h"
13 #include "webkit/fileapi/file_system_dir_url_request_job.h" 13 #include "webkit/fileapi/file_system_dir_url_request_job.h"
14 14
15 namespace fileapi { 15 namespace fileapi {
16 16
17 namespace { 17 namespace {
18 18
19 class FileSystemProtocolHandler 19 class FileSystemProtocolHandler
20 : public net::URLRequestJobFactory::ProtocolHandler { 20 : public net::URLRequestJobFactory::ProtocolHandler {
21 public: 21 public:
22 explicit FileSystemProtocolHandler(FileSystemContext* context); 22 explicit FileSystemProtocolHandler(FileSystemContext* context);
23 virtual ~FileSystemProtocolHandler(); 23 virtual ~FileSystemProtocolHandler();
24 24
25 virtual net::URLRequestJob* MaybeCreateJob( 25 virtual net::URLRequestJob* MaybeCreateJob(
26 net::URLRequest* request) const OVERRIDE; 26 net::URLRequest* request,
27 net::NetworkDelegate* network_delegate) const OVERRIDE;
27 28
28 private: 29 private:
29 // No scoped_refptr because |file_system_context_| is owned by the 30 // No scoped_refptr because |file_system_context_| is owned by the
30 // ProfileIOData, which also owns this ProtocolHandler. 31 // ProfileIOData, which also owns this ProtocolHandler.
31 FileSystemContext* const file_system_context_; 32 FileSystemContext* const file_system_context_;
32 33
33 DISALLOW_COPY_AND_ASSIGN(FileSystemProtocolHandler); 34 DISALLOW_COPY_AND_ASSIGN(FileSystemProtocolHandler);
34 }; 35 };
35 36
36 FileSystemProtocolHandler::FileSystemProtocolHandler( 37 FileSystemProtocolHandler::FileSystemProtocolHandler(
37 FileSystemContext* context) 38 FileSystemContext* context)
38 : file_system_context_(context) { 39 : file_system_context_(context) {
39 DCHECK(file_system_context_); 40 DCHECK(file_system_context_);
40 } 41 }
41 42
42 FileSystemProtocolHandler::~FileSystemProtocolHandler() {} 43 FileSystemProtocolHandler::~FileSystemProtocolHandler() {}
43 44
44 net::URLRequestJob* FileSystemProtocolHandler::MaybeCreateJob( 45 net::URLRequestJob* FileSystemProtocolHandler::MaybeCreateJob(
45 net::URLRequest* request) const { 46 net::URLRequest* request, net::NetworkDelegate* network_delegate) const {
46 const std::string path = request->url().path(); 47 const std::string path = request->url().path();
47 48
48 // If the path ends with a /, we know it's a directory. If the path refers 49 // If the path ends with a /, we know it's a directory. If the path refers
49 // to a directory and gets dispatched to FileSystemURLRequestJob, that class 50 // to a directory and gets dispatched to FileSystemURLRequestJob, that class
50 // redirects back here, by adding a / to the URL. 51 // redirects back here, by adding a / to the URL.
51 if (!path.empty() && path[path.size() - 1] == '/') { 52 if (!path.empty() && path[path.size() - 1] == '/') {
52 return new FileSystemDirURLRequestJob(request, file_system_context_); 53 return new FileSystemDirURLRequestJob(
54 request, network_delegate, file_system_context_);
53 } 55 }
54 return new FileSystemURLRequestJob(request, file_system_context_); 56 return new FileSystemURLRequestJob(
57 request, network_delegate, file_system_context_);
55 } 58 }
56 59
57 } // anonymous namespace 60 } // anonymous namespace
58 61
59 net::URLRequestJobFactory::ProtocolHandler* 62 net::URLRequestJobFactory::ProtocolHandler*
60 CreateFileSystemProtocolHandler(FileSystemContext* context) { 63 CreateFileSystemProtocolHandler(FileSystemContext* context) {
61 DCHECK(context); 64 DCHECK(context);
62 return new FileSystemProtocolHandler(context); 65 return new FileSystemProtocolHandler(context);
63 } 66 }
64 67
65 } // namespace fileapi 68 } // namespace fileapi
OLDNEW
« no previous file with comments | « webkit/fileapi/file_system_url_request_job.cc ('k') | webkit/fileapi/file_system_url_request_job_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698