diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-10 05:56:56 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-10 05:56:56 +0000 |
| commit | aa051274bdd5359b31fe250152a7db8ccf2879bf (patch) | |
| tree | 8fbc6bde879e0d82bb602ce7b366bf86172719c8 /android_webview/browser | |
| parent | c53f6ac2da44db7f880f548f4ba393168d211e9c (diff) | |
| download | chromium_src-aa051274bdd5359b31fe250152a7db8ccf2879bf.zip chromium_src-aa051274bdd5359b31fe250152a7db8ccf2879bf.tar.gz chromium_src-aa051274bdd5359b31fe250152a7db8ccf2879bf.tar.bz2 | |
Simplify the user agent code some more since after r255534 it's not affected by the site's URL.
Code in content always gets it now from ContentClient::GetUserAgent. In Chrome, there's a GetUserAgent function which returns it.
BUG=338338
R=isherman@chromium.org, pauljensen@chromium.org, scottmg@chromium.org, tfarina@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=255858
Review URL: https://codereview.chromium.org/191093002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255877 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/browser')
| -rw-r--r-- | android_webview/browser/net/aw_url_request_context_getter.cc | 3 |
1 files changed, 2 insertions, 1 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 2ee7525..38c70a2 100644 --- a/android_webview/browser/net/aw_url_request_context_getter.cc +++ b/android_webview/browser/net/aw_url_request_context_getter.cc @@ -11,6 +11,7 @@ #include "android_webview/browser/net/aw_network_delegate.h" #include "android_webview/browser/net/aw_url_request_job_factory.h" #include "android_webview/browser/net/init_native_callback.h" +#include "android_webview/common/aw_content_client.h" #include "android_webview/common/aw_switches.h" #include "base/command_line.h" #include "base/strings/string_number_conversions.h" @@ -177,7 +178,7 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() { DCHECK(!url_request_context_); net::URLRequestContextBuilder builder; - builder.set_user_agent(content::GetUserAgent(GURL())); + builder.set_user_agent(GetUserAgent()); builder.set_network_delegate(new AwNetworkDelegate()); #if !defined(DISABLE_FTP_SUPPORT) builder.set_ftp_enabled(false); // Android WebView does not support ftp yet. |