summaryrefslogtreecommitdiffstats
path: root/WebKit/android/jni/WebSettings.cpp
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2009-08-21 10:49:02 +0100
committerSteve Block <steveblock@google.com>2009-08-21 15:04:54 +0100
commita7f4953b4f6bd15510aa67ffe11c85130aedbd26 (patch)
tree867f75aa78fac50f22d026f15ddcc2ce89946bb1 /WebKit/android/jni/WebSettings.cpp
parent05cfa5870418c86a9becc359a842a2f735092bd3 (diff)
downloadexternal_webkit-a7f4953b4f6bd15510aa67ffe11c85130aedbd26.zip
external_webkit-a7f4953b4f6bd15510aa67ffe11c85130aedbd26.tar.gz
external_webkit-a7f4953b4f6bd15510aa67ffe11c85130aedbd26.tar.bz2
Adds WebKit-side of logic to make Geolocation obey Browser 'Enagle Location' setting.
This fixes bug http://b/issue?id=2067559.
Diffstat (limited to 'WebKit/android/jni/WebSettings.cpp')
-rw-r--r--WebKit/android/jni/WebSettings.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp
index eca03cc..dcc4ab6 100644
--- a/WebKit/android/jni/WebSettings.cpp
+++ b/WebKit/android/jni/WebSettings.cpp
@@ -100,6 +100,7 @@ struct FieldIds {
#if ENABLE(WORKERS)
mWorkersEnabled = env->GetFieldID(clazz, "mWorkersEnabled", "Z");
#endif
+ mGeolocationEnabled = env->GetFieldID(clazz, "mGeolocationEnabled", "Z");
mJavaScriptCanOpenWindowsAutomatically = env->GetFieldID(clazz,
"mJavaScriptCanOpenWindowsAutomatically", "Z");
mUseWideViewport = env->GetFieldID(clazz, "mUseWideViewport", "Z");
@@ -195,6 +196,7 @@ struct FieldIds {
#if ENABLE(DOM_STORAGE)
jfieldID mDomStorageEnabled;
#endif
+ jfieldID mGeolocationEnabled;
#if ENABLE(DATABASE) || ENABLE(DOM_STORAGE)
jfieldID mDatabasePath;
#endif
@@ -349,6 +351,9 @@ public:
}
}
#endif
+
+ flag = env->GetBooleanField(obj, gFieldIds->mGeolocationEnabled);
+ GeolocationPermissions::setAlwaysDeny(!flag);
}
};