summaryrefslogtreecommitdiffstats
path: root/WebKit/android/WebCoreSupport
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-02-23 07:26:49 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-02-23 07:26:49 -0800
commit9ec5bc25beca2ca00218089cf4f3a5efb79f3448 (patch)
treee63cd712836968460ac02b867ecf990272f78d19 /WebKit/android/WebCoreSupport
parent9435a5cad7c5f2083083288a7db7c74115573b2a (diff)
parent234ad679c5705a581292e45349c33513bbaa526a (diff)
downloadexternal_webkit-9ec5bc25beca2ca00218089cf4f3a5efb79f3448.zip
external_webkit-9ec5bc25beca2ca00218089cf4f3a5efb79f3448.tar.gz
external_webkit-9ec5bc25beca2ca00218089cf4f3a5efb79f3448.tar.bz2
Merge "Cherry-pick WebKit change 55136 to add a means to cancel an ongoing Geolocation permission request"
Diffstat (limited to 'WebKit/android/WebCoreSupport')
-rw-r--r--WebKit/android/WebCoreSupport/ChromeClientAndroid.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
index e75393b..15473ca 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
@@ -143,6 +143,7 @@ namespace android {
// Methods used to request and provide Geolocation permissions.
virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
+ virtual void cancelGeolocationPermissionRequestForFrame(Frame*) { }
// Android-specific
void provideGeolocationPermissions(const String &origin, bool allow, bool remember);
void storeGeolocationPermissions();