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

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

Issue 12463021: Stop sending Accept-Charset HTTP header. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix comment 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
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 "android_webview/browser/aw_browser_context.h" 7 #include "android_webview/browser/aw_browser_context.h"
8 #include "android_webview/browser/aw_request_interceptor.h" 8 #include "android_webview/browser/aw_request_interceptor.h"
9 #include "android_webview/browser/net/aw_network_delegate.h" 9 #include "android_webview/browser/net/aw_network_delegate.h"
10 #include "android_webview/browser/net/aw_url_request_job_factory.h" 10 #include "android_webview/browser/net/aw_url_request_job_factory.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 net::URLRequestContextBuilder builder; 50 net::URLRequestContextBuilder builder;
51 builder.set_user_agent(content::GetUserAgent(GURL())); 51 builder.set_user_agent(content::GetUserAgent(GURL()));
52 builder.set_network_delegate(new AwNetworkDelegate()); 52 builder.set_network_delegate(new AwNetworkDelegate());
53 builder.set_ftp_enabled(false); // Android WebView does not support ftp yet. 53 builder.set_ftp_enabled(false); // Android WebView does not support ftp yet.
54 builder.set_proxy_config_service(proxy_config_service_.release()); 54 builder.set_proxy_config_service(proxy_config_service_.release());
55 builder.set_accept_language(net::HttpUtil::GenerateAcceptLanguageHeader( 55 builder.set_accept_language(net::HttpUtil::GenerateAcceptLanguageHeader(
56 content::GetContentClient()->browser()->GetAcceptLangs( 56 content::GetContentClient()->browser()->GetAcceptLangs(
57 browser_context_))); 57 browser_context_)));
58 58
59 builder.set_accept_charset(
60 net::HttpUtil::GenerateAcceptCharsetHeader("utf-8"));
61
62 url_request_context_.reset(builder.Build()); 59 url_request_context_.reset(builder.Build());
63 60
64 // TODO(mnaganov): Fix URLRequestContextBuilder to use proper threads. 61 // TODO(mnaganov): Fix URLRequestContextBuilder to use proper threads.
65 net::HttpNetworkSession::Params network_session_params; 62 net::HttpNetworkSession::Params network_session_params;
66 PopulateNetworkSessionParams(&network_session_params); 63 PopulateNetworkSessionParams(&network_session_params);
67 net::HttpCache* main_cache = new net::HttpCache( 64 net::HttpCache* main_cache = new net::HttpCache(
68 network_session_params, 65 network_session_params,
69 new net::HttpCache::DefaultBackend( 66 new net::HttpCache::DefaultBackend(
70 net::DISK_CACHE, 67 net::DISK_CACHE,
71 browser_context_->GetPath().Append(FILE_PATH_LITERAL("Cache")), 68 browser_context_->GetPath().Append(FILE_PATH_LITERAL("Cache")),
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 152 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
156 chrome_devtools_protocol_handler) { 153 chrome_devtools_protocol_handler) {
157 blob_protocol_handler_ = blob_protocol_handler.Pass(); 154 blob_protocol_handler_ = blob_protocol_handler.Pass();
158 file_system_protocol_handler_ = file_system_protocol_handler.Pass(); 155 file_system_protocol_handler_ = file_system_protocol_handler.Pass();
159 developer_protocol_handler_ = developer_protocol_handler.Pass(); 156 developer_protocol_handler_ = developer_protocol_handler.Pass();
160 chrome_protocol_handler_ = chrome_protocol_handler.Pass(); 157 chrome_protocol_handler_ = chrome_protocol_handler.Pass();
161 chrome_devtools_protocol_handler_ = chrome_devtools_protocol_handler.Pass(); 158 chrome_devtools_protocol_handler_ = chrome_devtools_protocol_handler.Pass();
162 } 159 }
163 160
164 } // namespace android_webview 161 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/automation/url_request_automation_job.cc » ('j') | chrome/browser/io_thread.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698