summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--android_webview/java/src/org/chromium/android_webview/AwContentsClient.java8
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/NullContentsClient.java10
2 files changed, 13 insertions, 5 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java b/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
index aafc0f3..cdaf97c 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
@@ -220,12 +220,10 @@ public abstract class AwContentsClient extends ContentViewClient {
public abstract void onDownloadStart(String url, String userAgent, String contentDisposition,
String mimeType, long contentLength);
- // TODO(kristianm): Make abstract when landed in Android
- public void onGeolocationPermissionsShowPrompt(String origin,
- GeolocationPermissions.Callback callback) {}
+ public abstract void onGeolocationPermissionsShowPrompt(String origin,
+ GeolocationPermissions.Callback callback);
- // TODO(kristianm): Make abstract when landed in Android
- public void onGeolocationPermissionsHidePrompt() {}
+ public abstract void onGeolocationPermissionsHidePrompt();
protected abstract void handleJsAlert(String url, String message, JsResultReceiver receiver);
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/NullContentsClient.java b/android_webview/javatests/src/org/chromium/android_webview/test/NullContentsClient.java
index ee3b979..6411d4e 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/NullContentsClient.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/NullContentsClient.java
@@ -8,6 +8,7 @@ import android.content.Context;
import android.os.Message;
import android.view.KeyEvent;
import android.webkit.ConsoleMessage;
+import android.webkit.GeolocationPermissions;
import org.chromium.android_webview.AwContentsClient;
import org.chromium.android_webview.AwHttpAuthHandler;
@@ -57,6 +58,15 @@ class NullContentsClient extends AwContentsClient {
}
@Override
+ public void onGeolocationPermissionsShowPrompt(String origin,
+ GeolocationPermissions.Callback callback) {
+ }
+
+ @Override
+ public void onGeolocationPermissionsHidePrompt() {
+ }
+
+ @Override
public void handleJsAlert(String url, String message, JsResultReceiver receiver) {
}