diff options
| author | Steve Block <steveblock@google.com> | 2010-11-29 07:19:42 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-29 07:19:42 -0800 |
| commit | 454adf027eb747dd9d6c6b041f1d2d68f228c44b (patch) | |
| tree | 0df65d7a67702d4322a0d5472058ee04700f5723 /WebKit/android/WebCoreSupport/PlatformBridge.cpp | |
| parent | 9092f30ce1d2ad138d0095acddc2f5f4b2a025f9 (diff) | |
| parent | 8f71a88eb32d112e6277f0a0260df04e969d6f8a (diff) | |
| download | external_webkit-454adf027eb747dd9d6c6b041f1d2d68f228c44b.zip external_webkit-454adf027eb747dd9d6c6b041f1d2d68f228c44b.tar.gz external_webkit-454adf027eb747dd9d6c6b041f1d2d68f228c44b.tar.bz2 | |
Merge changes I006cddf2,Ib304a845,I4622749d
* changes:
Moves implementation of ResourceLoaderAndroid to ResourceLoaderAndroid.cpp
Add a static WebRequestContext::acceptLanguage() method
Make WebCookieJar::get() threadsafe
Diffstat (limited to 'WebKit/android/WebCoreSupport/PlatformBridge.cpp')
| -rw-r--r-- | WebKit/android/WebCoreSupport/PlatformBridge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/WebCoreSupport/PlatformBridge.cpp b/WebKit/android/WebCoreSupport/PlatformBridge.cpp index f17a73a..cd5088b 100644 --- a/WebKit/android/WebCoreSupport/PlatformBridge.cpp +++ b/WebKit/android/WebCoreSupport/PlatformBridge.cpp @@ -161,11 +161,11 @@ FloatRect PlatformBridge::screenRect() String PlatformBridge::computeDefaultLanguage() { #if USE(CHROME_NETWORK_STACK) - std::string acceptLanguages = WebRequestContext::get(false)->GetAcceptLanguage(); + String acceptLanguages = WebRequestContext::acceptLanguage(); size_t length = acceptLanguages.find(','); if (length == std::string::npos) length = acceptLanguages.length(); - return String::fromUTF8(acceptLanguages.c_str(), length); + return acceptLanguages.substring(0, length); #else return "en"; #endif |