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

Side by Side Diff: trunk/src/android_webview/browser/net/aw_url_request_context_getter.cc

Issue 12605011: Revert 188912 "Removed static factories for data, ftp, file, and..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 9 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
« no previous file with comments | « no previous file | trunk/src/android_webview/browser/net/aw_url_request_job_factory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "android_webview/browser/net/aw_url_request_context_getter.h" 5 #include "android_webview/browser/net/aw_url_request_context_getter.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "android_webview/browser/aw_browser_context.h" 9 #include "android_webview/browser/aw_browser_context.h"
10 #include "android_webview/browser/aw_request_interceptor.h" 10 #include "android_webview/browser/aw_request_interceptor.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 AwURLRequestContextGetter::~AwURLRequestContextGetter() { 45 AwURLRequestContextGetter::~AwURLRequestContextGetter() {
46 BrowserThread::SetDelegate(BrowserThread::IO, NULL); 46 BrowserThread::SetDelegate(BrowserThread::IO, NULL);
47 } 47 }
48 48
49 void AwURLRequestContextGetter::Init() { 49 void AwURLRequestContextGetter::Init() {
50 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 50 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
51 51
52 net::URLRequestContextBuilder builder; 52 net::URLRequestContextBuilder builder;
53 builder.set_user_agent(content::GetUserAgent(GURL())); 53 builder.set_user_agent(content::GetUserAgent(GURL()));
54 builder.set_network_delegate(new AwNetworkDelegate()); 54 builder.set_network_delegate(new AwNetworkDelegate());
55 #if !defined(DISABLE_FTP_SUPPORT)
56 builder.set_ftp_enabled(false); // Android WebView does not support ftp yet. 55 builder.set_ftp_enabled(false); // Android WebView does not support ftp yet.
57 #endif
58 builder.set_proxy_config_service(proxy_config_service_.release()); 56 builder.set_proxy_config_service(proxy_config_service_.release());
59 builder.set_accept_language(net::HttpUtil::GenerateAcceptLanguageHeader( 57 builder.set_accept_language(net::HttpUtil::GenerateAcceptLanguageHeader(
60 content::GetContentClient()->browser()->GetAcceptLangs( 58 content::GetContentClient()->browser()->GetAcceptLangs(
61 browser_context_))); 59 browser_context_)));
62 60
63 url_request_context_.reset(builder.Build()); 61 url_request_context_.reset(builder.Build());
64 62
65 // TODO(mnaganov): Fix URLRequestContextBuilder to use proper threads. 63 // TODO(mnaganov): Fix URLRequestContextBuilder to use proper threads.
66 net::HttpNetworkSession::Params network_session_params; 64 net::HttpNetworkSession::Params network_session_params;
67 PopulateNetworkSessionParams(&network_session_params); 65 PopulateNetworkSessionParams(&network_session_params);
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 AwURLRequestContextGetter::GetNetworkTaskRunner() const { 166 AwURLRequestContextGetter::GetNetworkTaskRunner() const {
169 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO); 167 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
170 } 168 }
171 169
172 void AwURLRequestContextGetter::SetProtocolHandlers( 170 void AwURLRequestContextGetter::SetProtocolHandlers(
173 content::ProtocolHandlerMap* protocol_handlers) { 171 content::ProtocolHandlerMap* protocol_handlers) {
174 std::swap(protocol_handlers_, *protocol_handlers); 172 std::swap(protocol_handlers_, *protocol_handlers);
175 } 173 }
176 174
177 } // namespace android_webview 175 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | trunk/src/android_webview/browser/net/aw_url_request_job_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698