2 files changed, 1 insertions, 12 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index af74638..6495bb4 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -127,11 +127,8 @@ float ChromeClientAndroid::scaleFactor()
 void ChromeClientAndroid::focus()
 {
     ASSERT(m_webFrame);
-#ifdef ANDROID_USER_GESTURE_CHECK
     bool isUserGesture = UserGestureIndicator::processingUserGesture();
-#else
-    bool isUserGesture = true;
-#endif
+
     // Ask the application to focus this WebView if the action is intiated by the user
     if (isUserGesture)
         m_webFrame->requestFocus();
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 7324173..f57a94f 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -482,11 +482,7 @@ WebFrame::startLoadingResource(WebCore::ResourceHandle* loader,
     jstring jPasswordString = loaderInternal->m_pass.isEmpty() ?
             NULL : env->NewString(loaderInternal->m_pass.characters(), loaderInternal->m_pass.length());
 
-#ifdef ANDROID_USER_GESTURE_CHECK
     bool isUserGesture = UserGestureIndicator::processingUserGesture();
-#else
-    bool isUserGesture = true;
-#endif
     jobject jLoadListener =
         env->CallObjectMethod(obj.get(), mJavaFrame->mStartLoadingResource,
                 (int)loader, jUrlStr, jMethodStr, jHeaderMap,
@@ -756,11 +752,7 @@ WebFrame::canHandleRequest(const WebCore::ResourceRequest& request)
     if (equalIgnoringCase(request.httpMethod(), "POST"))
         return true;
     WebCore::KURL requestUrl = request.url();
-#ifdef ANDROID_USER_GESTURE_CHECK
     bool isUserGesture = UserGestureIndicator::processingUserGesture();
-#else
-    bool isUserGesture = true;
-#endif
     if (!mUserInitiatedClick && !isUserGesture && 
             (requestUrl.protocolIs("http") || requestUrl.protocolIs("https") ||
             requestUrl.protocolIs("file") || requestUrl.protocolIs("about") ||