Index: android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java |
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java |
index 8413a716660ff86c612dd634543b045ef2e7c1fe..11741bc0de05b755d9e30308c6a65452686c9d47 100644 |
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java |
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java |
@@ -34,7 +34,6 @@ import android.webkit.SslErrorHandler; |
import android.webkit.ValueCallback; |
import android.webkit.WebChromeClient; |
import android.webkit.WebChromeClient.CustomViewCallback; |
-import android.webkit.WebResourceRequest; |
import android.webkit.WebResourceResponse; |
import android.webkit.WebView; |
import android.webkit.WebViewClient; |
@@ -44,7 +43,6 @@ import com.android.webview.chromium.WebViewDelegateFactory.WebViewDelegate; |
import org.chromium.android_webview.AwContentsClient; |
import org.chromium.android_webview.AwContentsClientBridge; |
import org.chromium.android_webview.AwHttpAuthHandler; |
-import org.chromium.android_webview.AwWebResourceResponse; |
import org.chromium.android_webview.JsPromptResultReceiver; |
import org.chromium.android_webview.JsResultReceiver; |
import org.chromium.android_webview.permission.AwPermissionRequest; |
@@ -60,8 +58,6 @@ import java.security.Principal; |
import java.security.PrivateKey; |
import java.security.cert.X509Certificate; |
import java.util.ArrayList; |
-import java.util.HashMap; |
-import java.util.Map; |
import java.util.WeakHashMap; |
/** |
@@ -284,62 +280,15 @@ public class WebViewContentsClientAdapter extends AwContentsClient { |
} |
} |
- private static class WebResourceRequestImpl implements WebResourceRequest { |
- private final AwWebResourceRequest mRequest; |
- |
- public WebResourceRequestImpl(AwWebResourceRequest request) { |
- mRequest = request; |
- } |
- |
- @Override |
- public Uri getUrl() { |
- return Uri.parse(mRequest.url); |
- } |
- |
- @Override |
- public boolean isForMainFrame() { |
- return mRequest.isMainFrame; |
- } |
- |
- @Override |
- public boolean hasGesture() { |
- return mRequest.hasUserGesture; |
- } |
- |
- @Override |
- public String getMethod() { |
- return mRequest.method; |
- } |
- |
- @Override |
- public Map<String, String> getRequestHeaders() { |
- return mRequest.requestHeaders; |
- } |
- } |
- |
/** |
* @see AwContentsClient#shouldInterceptRequest(java.lang.String) |
*/ |
@Override |
- public AwWebResourceResponse shouldInterceptRequest(AwWebResourceRequest request) { |
+ public WebResourceResponse shouldInterceptRequest(WebResourceRequestImpl request) { |
mnaganov (inactive)
2015/03/06 12:47:40
Hmm... I'm actually not sure that we should pass a
|
try { |
TraceEvent.begin("WebViewContentsClientAdapter.shouldInterceptRequest"); |
- if (TRACE) Log.d(TAG, "shouldInterceptRequest=" + request.url); |
- WebResourceResponse response = mWebViewClient.shouldInterceptRequest(mWebView, |
- new WebResourceRequestImpl(request)); |
- if (response == null) return null; |
- |
- // AwWebResourceResponse should support null headers. b/16332774. |
- Map<String, String> responseHeaders = response.getResponseHeaders(); |
- if (responseHeaders == null) responseHeaders = new HashMap<String, String>(); |
- |
- return new AwWebResourceResponse( |
- response.getMimeType(), |
- response.getEncoding(), |
- response.getData(), |
- response.getStatusCode(), |
- response.getReasonPhrase(), |
- responseHeaders); |
+ if (TRACE) Log.d(TAG, "shouldInterceptRequest=" + request.getUrl()); |
+ return mWebViewClient.shouldInterceptRequest(mWebView, request); |
} finally { |
TraceEvent.end("WebViewContentsClientAdapter.shouldInterceptRequest"); |
} |