summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authormnaganov <mnaganov@chromium.org>2015-12-18 16:23:26 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-19 00:24:07 +0000
commitab0baf08044ca172c6c121089de1f529ecbc66a0 (patch)
treee279a382b2d97fe23afd3fa379508f82b76621fa /android_webview
parent250e6ef127d3c4959bfcabb407a8c3d28d3d4e44 (diff)
downloadchromium_src-ab0baf08044ca172c6c121089de1f529ecbc66a0.zip
chromium_src-ab0baf08044ca172c6c121089de1f529ecbc66a0.tar.gz
chromium_src-ab0baf08044ca172c6c121089de1f529ecbc66a0.tar.bz2
[Android WebView] Implement onGeolocationPermissionsShowPrompt in AwShell
If the shell doesn't call the callback, then a request gets stalled inside PermissionService, and this causes a DCHECK in its destructor to fail when the renderer is terminated. Review URL: https://codereview.chromium.org/1540553004 Cr-Commit-Position: refs/heads/master@{#366228}
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
index ecfca18..3ed04908 100644
--- a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
+++ b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java
@@ -20,6 +20,7 @@ import android.view.ViewGroup.LayoutParams;
import android.view.WindowManager;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
+import android.webkit.GeolocationPermissions;
import android.webkit.WebChromeClient;
import android.widget.EditText;
import android.widget.FrameLayout;
@@ -160,6 +161,12 @@ public class AwShellActivity extends Activity {
}
return false;
}
+
+ @Override
+ public void onGeolocationPermissionsShowPrompt(String origin,
+ GeolocationPermissions.Callback callback) {
+ callback.invoke(origin, false, false);
+ }
};
SharedPreferences sharedPreferences =