summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Kosiba <mkosiba@google.com>2014-09-12 17:29:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-12 17:29:32 +0000
commitfae9ed9acdc780102b60fcc4269662174f4aa3a3 (patch)
tree12960936c63c7cfd2f4fe82e1b0ddb5d6ab34b88
parenta17d86e955b57c52637ccb8c46b01a71425d76b8 (diff)
parentb709ef5b46f5ef3d33dd9aefe125fd2ec6ba0680 (diff)
downloadwebview-fae9ed9acdc780102b60fcc4269662174f4aa3a3.tar.gz
Merge "Match rename of WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev
-rw-r--r--chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java b/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
index c2cc671..8d92630 100644
--- a/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
+++ b/chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java
@@ -287,10 +287,7 @@ public class WebViewContentsClientAdapter extends AwContentsClient {
return mParams.isMainFrame;
}
- public boolean hasUserGestureInsecure() {
- return mParams.hasUserGesture;
- }
-
+ @Override
public boolean hasGesture() {
return mParams.hasUserGesture;
}