summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIain Merrick <husky@google.com>2010-12-01 06:46:37 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-01 06:46:37 -0800
commitbb5719a9c1b5209cf088271b9fed946fef01edb5 (patch)
treec9d14da9b67af17b2056915472e3108cac5ef286
parent0673ac913795215d11e7b043d50eaa9dd211548a (diff)
parent26f434aca230193a44d0ccc1abe25f54d59df2fd (diff)
downloadexternal_webkit-bb5719a9c1b5209cf088271b9fed946fef01edb5.zip
external_webkit-bb5719a9c1b5209cf088271b9fed946fef01edb5.tar.gz
external_webkit-bb5719a9c1b5209cf088271b9fed946fef01edb5.tar.bz2
Merge "Add FlushCookieStore() method to CookieManager (C++ side)."
-rw-r--r--WebKit/android/jni/CookieManager.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/WebKit/android/jni/CookieManager.cpp b/WebKit/android/jni/CookieManager.cpp
index 821d28d..0053e4f 100644
--- a/WebKit/android/jni/CookieManager.cpp
+++ b/WebKit/android/jni/CookieManager.cpp
@@ -155,6 +155,14 @@ static void setCookie(JNIEnv* env, jobject, jstring url, jstring value)
#endif
}
+static void flushCookieStore(JNIEnv*, jobject)
+{
+#if USE(CHROME_NETWORK_STACK)
+ WebCookieJar::get(false)->cookieStore()->GetCookieMonster()->FlushStore();
+ WebCookieJar::get(true)->cookieStore()->GetCookieMonster()->FlushStore();
+#endif
+}
+
static JNINativeMethod gCookieManagerMethods[] = {
{ "nativeUseChromiumHttpStack", "()Z", (void*) useChromiumHttpStack },
{ "nativeAcceptCookie", "()Z", (void*) acceptCookie },
@@ -165,6 +173,7 @@ static JNINativeMethod gCookieManagerMethods[] = {
{ "nativeRemoveSessionCookie", "()V", (void*) removeSessionCookie },
{ "nativeSetAcceptCookie", "(Z)V", (void*) setAcceptCookie },
{ "nativeSetCookie", "(Ljava/lang/String;Ljava/lang/String;)V", (void*) setCookie },
+ { "nativeFlushCookieStore", "()V", (void*) flushCookieStore },
};
int registerCookieManager(JNIEnv* env)