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

Unified Diff: mojo/loader/url_request_context_getter.cc

Issue 38303002: Enable Mojo to download from file URLs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unneeded include Created 7 years, 2 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: mojo/loader/url_request_context_getter.cc
diff --git a/mojo/loader/url_request_context_getter.cc b/mojo/loader/url_request_context_getter.cc
index 992b36f3b52a77090ea4ac717f360800e3bbe11a..80237ffdb1abed1e99be341cdee527db0f50d936 100644
--- a/mojo/loader/url_request_context_getter.cc
+++ b/mojo/loader/url_request_context_getter.cc
@@ -10,8 +10,10 @@
#include "net/http/http_server_properties_impl.h"
#include "net/proxy/proxy_service.h"
#include "net/ssl/ssl_config_service_defaults.h"
+#include "net/url_request/file_protocol_handler.h"
#include "net/url_request/static_http_user_agent_settings.h"
#include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_file_job.h"
#include "net/url_request/url_request_job_factory_impl.h"
namespace mojo {
@@ -20,10 +22,14 @@ namespace loader {
URLRequestContextGetter::URLRequestContextGetter(
base::FilePath base_path,
base::SingleThreadTaskRunner* network_task_runner,
- base::MessageLoopProxy* cache_task_runner)
+ base::SingleThreadTaskRunner* file_task_runner,
+ base::MessageLoopProxy* cache_task_runner,
+ scoped_ptr<net::NetworkDelegate> network_delegate)
: base_path_(base_path),
+ file_task_runner_(file_task_runner),
network_task_runner_(network_task_runner),
cache_task_runner_(cache_task_runner),
+ network_delegate_(network_delegate.Pass()),
net_log_(new net::NetLog()) {
}
@@ -34,6 +40,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
if (!url_request_context_) {
url_request_context_.reset(new net::URLRequestContext());
url_request_context_->set_net_log(net_log_.get());
+ url_request_context_->set_network_delegate(network_delegate_.get());
storage_.reset(
new net::URLRequestContextStorage(url_request_context_.get()));
@@ -78,7 +85,9 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
scoped_ptr<net::URLRequestJobFactoryImpl> job_factory(
new net::URLRequestJobFactoryImpl());
-
+ job_factory->SetProtocolHandler(
+ "file",
+ new net::FileProtocolHandler(file_task_runner_));
storage_->set_job_factory(job_factory.release());
}
« mojo/DEPS ('K') | « mojo/loader/url_request_context_getter.h ('k') | mojo/mojo.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698