diff options
| author | pauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-07 15:08:43 +0000 |
|---|---|---|
| committer | pauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-07 15:08:43 +0000 |
| commit | ee4c30d8c5fca53a990da472de17314de366341b (patch) | |
| tree | bc52b41397e143b46d0673991a13052edb1c9c66 /android_webview/browser/net | |
| parent | 91d4f2541624923604d54fdf280483a08a393464 (diff) | |
| download | chromium_src-ee4c30d8c5fca53a990da472de17314de366341b.zip chromium_src-ee4c30d8c5fca53a990da472de17314de366341b.tar.gz chromium_src-ee4c30d8c5fca53a990da472de17314de366341b.tar.bz2 | |
Provide mutable members of UrlRequestContext via pure-virtual interface. Create a pure-virtual interface called HttpUserAgentSettings that provides access to the Accept-Language, Accept-Charset, and User-Agent HTTP headers. Each UrlRequestContext should have a HttpUserAgentSettings implementation attached via set_http_user_agent_settings().
BUG=146596
Review URL: https://chromiumcodereview.appspot.com/10918279
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166425 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/browser/net')
| -rw-r--r-- | android_webview/browser/net/aw_url_request_context_getter.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc index 8fbe53c..9b51826 100644 --- a/android_webview/browser/net/aw_url_request_context_getter.cc +++ b/android_webview/browser/net/aw_url_request_context_getter.cc @@ -84,6 +84,13 @@ void AwURLRequestContextGetter::Init() { builder.set_network_delegate(new AwNetworkDelegate()); builder.set_ftp_enabled(false); // Android WebView does not support ftp yet. builder.set_proxy_config_service(proxy_config_service_.release()); + builder.set_accept_language(net::HttpUtil::GenerateAcceptLanguageHeader( + content::GetContentClient()->browser()->GetAcceptLangs( + browser_context_))); + + // TODO(boliu): Values from chrome/app/resources/locale_settings_en-GB.xtb + builder.set_accept_charset( + net::HttpUtil::GenerateAcceptCharsetHeader("ISO-8859-1")); net::URLRequestContextBuilder::HttpCacheParams cache_params; cache_params.type = net::URLRequestContextBuilder::HttpCacheParams::DISK; @@ -94,15 +101,6 @@ void AwURLRequestContextGetter::Init() { url_request_context_.reset(builder.Build()); - url_request_context_->set_accept_language( - net::HttpUtil::GenerateAcceptLanguageHeader( - content::GetContentClient()->browser()->GetAcceptLangs( - browser_context_))); - - // TODO(boliu): Values from chrome/app/resources/locale_settings_en-GB.xtb - url_request_context_->set_accept_charset( - net::HttpUtil::GenerateAcceptCharsetHeader("ISO-8859-1")); - job_factory_.reset(new AwURLRequestJobFactory); bool set_protocol = job_factory_->SetProtocolHandler( chrome::kFileScheme, new net::FileProtocolHandler()); |