commit fae9ed9acdc780102b60fcc4269662174f4aa3a3
author Marcin Kosiba <mkosiba@google.com> Fri Sep 12 17:29:31 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 12 17:29:32 2014 +0000
tree 12960936c63c7cfd2f4fe82e1b0ddb5d6ab34b88
parent a17d86e955b57c52637ccb8c46b01a71425d76b8
parent b709ef5b46f5ef3d33dd9aefe125fd2ec6ba0680

Merge "Match rename of WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev

chromium/java/com/android/webview/chromium/WebViewContentsClientAdapter.java

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 @@
             return mParams.isMainFrame;
         }
 
-        public boolean hasUserGestureInsecure() {
-            return mParams.hasUserGesture;
-        }
-
+        @Override
         public boolean hasGesture() {
             return mParams.hasUserGesture;
         }