diff options
author | Marcin Kosiba <mkosiba@google.com> | 2014-09-19 09:53:15 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-19 09:53:16 +0000 |
commit | 83dc52fe3eece77a9d042df265582963853b84c2 (patch) | |
tree | 81b78a5d4a97509bcb6d5f922c7766d5e0aaeaaa /chromium/java/com | |
parent | c4da9b7d1b82e905cfb36809f58e13557b56b8a4 (diff) | |
parent | a63a43a08e447d69f7472d13b97cd402064f683a (diff) | |
download | webview-83dc52fe3eece77a9d042df265582963853b84c2.tar.gz |
Merge "Match rename of WebResourceRequest.hasUserGestureInsecure to hasGesture." into master-chromium
Diffstat (limited to 'chromium/java/com')
-rw-r--r-- | chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java | 5 |
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; } |