| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "mojo/services/network/network_context.h" | 5 #include "mojo/services/network/network_context.h" |
| 6 | 6 |
| 7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
| 8 #include "base/path_service.h" | |
| 9 #include "net/proxy/proxy_service.h" | 8 #include "net/proxy/proxy_service.h" |
| 10 #include "net/url_request/url_request_context.h" | 9 #include "net/url_request/url_request_context.h" |
| 11 #include "net/url_request/url_request_context_builder.h" | 10 #include "net/url_request/url_request_context_builder.h" |
| 12 | 11 |
| 13 namespace mojo { | 12 namespace mojo { |
| 14 | 13 |
| 15 NetworkContext::NetworkContext(const base::FilePath& base_path) { | 14 NetworkContext::NetworkContext(const base::FilePath& base_path) { |
| 16 net::URLRequestContextBuilder builder; | 15 net::URLRequestContextBuilder builder; |
| 17 builder.set_accept_language("en-us,en"); | 16 builder.set_accept_language("en-us,en"); |
| 18 // TODO(darin): This is surely the wrong UA string. | 17 // TODO(darin): This is surely the wrong UA string. |
| (...skipping 12 matching lines...) Expand all Loading... |
| 31 builder.set_file_enabled(true); | 30 builder.set_file_enabled(true); |
| 32 | 31 |
| 33 url_request_context_.reset(builder.Build()); | 32 url_request_context_.reset(builder.Build()); |
| 34 } | 33 } |
| 35 | 34 |
| 36 NetworkContext::~NetworkContext() { | 35 NetworkContext::~NetworkContext() { |
| 37 // TODO(darin): Be careful about destruction order of member variables? | 36 // TODO(darin): Be careful about destruction order of member variables? |
| 38 } | 37 } |
| 39 | 38 |
| 40 } // namespace mojo | 39 } // namespace mojo |
| OLD | NEW |