diff options
| author | Steve Block <steveblock@google.com> | 2010-10-27 09:49:32 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-10-27 14:07:29 +0100 |
| commit | f8d8851981c0c0605a653850bddde79841119470 (patch) | |
| tree | 91c048729d7d11e78da11a0e7db08e75220e2d6a /WebKit/android/jni/WebSettings.cpp | |
| parent | 054de1f8acc4c600081c0a52af7524ad6ab07629 (diff) | |
| download | external_webkit-f8d8851981c0c0605a653850bddde79841119470.zip external_webkit-f8d8851981c0c0605a653850bddde79841119470.tar.gz external_webkit-f8d8851981c0c0605a653850bddde79841119470.tar.bz2 | |
Fixes style in WebRequestContext
Previously this file used Chromium style, as it extends a Chromium
class. However, I think it's best to switch to WebKit style to prevent
Chromium style from leaking into the rest of WebKit.
Also switches static member methods to file-scope static functions
where possible.
Finally, return WebRequestContext* rather than URLRequestContext* to
allow us to call methods in the derived class. this will be required
to hook up CookieManager.
Change-Id: Ifdca62230a3728e338904ef1b9b392640af06a92
Diffstat (limited to 'WebKit/android/jni/WebSettings.cpp')
| -rw-r--r-- | WebKit/android/jni/WebSettings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp index 6dc5439..825476b 100644 --- a/WebKit/android/jni/WebSettings.cpp +++ b/WebKit/android/jni/WebSettings.cpp @@ -363,9 +363,9 @@ public: str = (jstring)env->GetObjectField(obj, gFieldIds->mUserAgent); WebFrame::getWebFrame(pFrame)->setUserAgent(jstringToWtfString(env, str)); #if USE(CHROME_NETWORK_STACK) - WebRequestContext::SetUserAgent(jstringToWtfString(env, str)); + WebRequestContext::setUserAgent(jstringToWtfString(env, str)); str = (jstring)env->GetObjectField(obj, gFieldIds->mAcceptLanguage); - WebRequestContext::SetAcceptLanguage(jstringToWtfString(env, str)); + WebRequestContext::setAcceptLanguage(jstringToWtfString(env, str)); #endif jint size = env->GetIntField(obj, gFieldIds->mMinimumFontSize); |