diff options
author | Elliott Slaughter <eds@google.com> | 2010-08-05 16:20:15 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-05 16:20:16 -0700 |
commit | 801a2989520f3f9b66e1f1dca6ca9a89226f0684 (patch) | |
tree | 6531512f951141247c5dc147abcb28c0aa7a674b | |
parent | 4f1225a6f76e25aece42ac72b02f3332f7c91910 (diff) | |
parent | 42869a26b8c45f087dbed2a2d6dbc8f780e8f9bf (diff) | |
download | external_webkit-801a2989520f3f9b66e1f1dca6ca9a89226f0684.zip external_webkit-801a2989520f3f9b66e1f1dca6ca9a89226f0684.tar.gz external_webkit-801a2989520f3f9b66e1f1dca6ca9a89226f0684.tar.bz2 |
Merge "Initial work on browser incognito mode history feature."
-rw-r--r-- | WebKit/android/jni/WebSettings.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp index d9a7cf0..4c524dc 100644 --- a/WebKit/android/jni/WebSettings.cpp +++ b/WebKit/android/jni/WebSettings.cpp @@ -116,6 +116,7 @@ struct FieldIds { mSupportMultipleWindows = env->GetFieldID(clazz, "mSupportMultipleWindows", "Z"); mShrinksStandaloneImagesToFit = env->GetFieldID(clazz, "mShrinksStandaloneImagesToFit", "Z"); mMaximumDecodedImageSize = env->GetFieldID(clazz, "mMaximumDecodedImageSize", "J"); + mPrivateBrowsingEnabled = env->GetFieldID(clazz, "mPrivateBrowsingEnabled", "Z"); mUseDoubleTree = env->GetFieldID(clazz, "mUseDoubleTree", "Z"); mPageCacheCapacity = env->GetFieldID(clazz, "mPageCacheCapacity", "I"); @@ -199,6 +200,7 @@ struct FieldIds { jfieldID mSupportMultipleWindows; jfieldID mShrinksStandaloneImagesToFit; jfieldID mMaximumDecodedImageSize; + jfieldID mPrivateBrowsingEnabled; jfieldID mUseDoubleTree; jfieldID mPageCacheCapacity; // Ordinal() method and value field for enums @@ -363,6 +365,10 @@ public: if (maxImage == 0) maxImage = computeMaxBitmapSizeForCache(); s->setMaximumDecodedImageSize(maxImage); + + flag = env->GetBooleanField(obj, gFieldIds->mPrivateBrowsingEnabled); + s->setPrivateBrowsingEnabled(flag); + #if ENABLE(DATABASE) flag = env->GetBooleanField(obj, gFieldIds->mDatabaseEnabled); WebCore::Database::setIsAvailable(flag); |