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

Unified Diff: chrome/browser/ui/webui/chrome_url_data_manager_backend.cc

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 nits 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
index 6e6216e7630b789e5cb2806d20eda9595368fed7..b11da17076382e84af6b0119d59583d42d86c995 100644
--- a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
+++ b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
@@ -568,21 +568,26 @@ bool IsSupportedURL(const GURL& url, FilePath* path) {
class DevToolsJobFactory
: public net::URLRequestJobFactory::ProtocolHandler {
public:
- explicit DevToolsJobFactory(ChromeURLDataManagerBackend* backend);
+ DevToolsJobFactory(ChromeURLDataManagerBackend* backend,
+ net::NetworkDelegate* network_delegate);
virtual ~DevToolsJobFactory();
virtual net::URLRequestJob* MaybeCreateJob(
net::URLRequest* request) const OVERRIDE;
private:
- // |backend_| is owned by ProfileIOData, which owns this ProtocolHandler.
+ // |backend_| and |network_delegate_| are owned by ProfileIOData, which owns
+ // this ProtocolHandler.
ChromeURLDataManagerBackend* const backend_;
+ net::NetworkDelegate* network_delegate_;
DISALLOW_COPY_AND_ASSIGN(DevToolsJobFactory);
};
-DevToolsJobFactory::DevToolsJobFactory(ChromeURLDataManagerBackend* backend)
- : backend_(backend) {
+DevToolsJobFactory::DevToolsJobFactory(ChromeURLDataManagerBackend* backend,
+ net::NetworkDelegate* network_delegate)
+ : backend_(backend),
+ network_delegate_(network_delegate) {
DCHECK(backend_);
}
@@ -593,7 +598,7 @@ DevToolsJobFactory::MaybeCreateJob(net::URLRequest* request) const {
if (ShouldLoadFromDisk()) {
FilePath path;
if (IsSupportedURL(request->url(), &path))
- return new net::URLRequestFileJob(request, path);
+ return new net::URLRequestFileJob(request, path, network_delegate_);
}
return new URLRequestChromeJob(request, backend_);
@@ -602,6 +607,7 @@ DevToolsJobFactory::MaybeCreateJob(net::URLRequest* request) const {
} // namespace
net::URLRequestJobFactory::ProtocolHandler*
-CreateDevToolsProtocolHandler(ChromeURLDataManagerBackend* backend) {
- return new DevToolsJobFactory(backend);
+CreateDevToolsProtocolHandler(ChromeURLDataManagerBackend* backend,
+ net::NetworkDelegate* network_delegate) {
+ return new DevToolsJobFactory(backend, network_delegate);
}
« no previous file with comments | « chrome/browser/ui/webui/chrome_url_data_manager_backend.h ('k') | content/test/net/url_request_mock_http_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698