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

Unified Diff: mojo/shell/loader.cc

Issue 38303002: Enable Mojo to download from file URLs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
« no previous file with comments | « mojo/shell/loader.h ('k') | mojo/shell/network_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/loader.cc
diff --git a/mojo/shell/loader.cc b/mojo/shell/loader.cc
index 9cf7651d5927a4e169e851c608cd635f0ab9abc3..7b73c7d2dacf46e56c3bf1d897146e039d9b6013 100644
--- a/mojo/shell/loader.cc
+++ b/mojo/shell/loader.cc
@@ -5,6 +5,7 @@
#include "mojo/shell/loader.h"
#include "base/message_loop/message_loop.h"
+#include "net/base/network_delegate.h"
namespace mojo {
namespace shell {
@@ -40,11 +41,16 @@ void Loader::Job::OnURLFetchComplete(const net::URLFetcher* source) {
Loader::Loader(base::SingleThreadTaskRunner* network_runner,
base::SingleThreadTaskRunner* file_runner,
+ scoped_ptr<net::NetworkDelegate> network_delegate,
base::FilePath base_path)
: file_runner_(file_runner),
cache_thread_(CreateIOThread("cache_thread")),
url_request_context_getter_(new URLRequestContextGetter(
- base_path, network_runner, cache_thread_->message_loop_proxy())) {
+ base_path,
+ network_runner,
+ file_runner,
+ cache_thread_->message_loop_proxy(),
+ network_delegate.Pass())) {
}
Loader::~Loader() {
« no previous file with comments | « mojo/shell/loader.h ('k') | mojo/shell/network_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698