diff options
| author | Steve Block <steveblock@google.com> | 2010-10-20 06:57:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-20 06:57:38 -0700 |
| commit | aad8713d6cfb278fcd0dbc93d8251a3023dd475f (patch) | |
| tree | bd0ca5ab72e59752f7edc96b19602e250d7b6e95 /WebKit | |
| parent | fa60e7f3dc14c77e6c52a7bce474373c1217d0b8 (diff) | |
| parent | 47f23f1d4fa00e9ca3acc75e22213816e83f44d7 (diff) | |
| download | external_webkit-aad8713d6cfb278fcd0dbc93d8251a3023dd475f.zip external_webkit-aad8713d6cfb278fcd0dbc93d8251a3023dd475f.tar.gz external_webkit-aad8713d6cfb278fcd0dbc93d8251a3023dd475f.tar.bz2 | |
Merge "Removes the unused default userAgent from WebRequestContext"
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/WebCoreSupport/WebRequestContext.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/WebRequestContext.cpp b/WebKit/android/WebCoreSupport/WebRequestContext.cpp index 300d5b2..b2a81c9 100644 --- a/WebKit/android/WebCoreSupport/WebRequestContext.cpp +++ b/WebKit/android/WebCoreSupport/WebRequestContext.cpp @@ -39,7 +39,9 @@ #include <wtf/Threading.h> namespace { -std::string userAgent("Mozilla/5.0 (Linux; U; Android 2.1; en-gb; Nexus One Build/ERE21) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17"); +// TODO: The userAgent should not be a static, as it can be set per WebView. +// http://b/3113804 +std::string userAgent(""); std::string acceptLanguage(""); Lock userAgentLock; @@ -76,6 +78,7 @@ void WebRequestContext::SetUserAgent(WTF::String string) const std::string& WebRequestContext::GetUserAgent(const GURL& url) const { AutoLock aLock(userAgentLock); + ASSERT(userAgent != ""); return userAgent; } |