| Index: android_webview/browser/android_protocol_handler.cc
|
| diff --git a/android_webview/native/android_protocol_handler.cc b/android_webview/browser/android_protocol_handler.cc
|
| similarity index 95%
|
| rename from android_webview/native/android_protocol_handler.cc
|
| rename to android_webview/browser/android_protocol_handler.cc
|
| index b59a840956c530863aed586e35bc44f6bb532204..2355206fadc5ddbec9d590f5516d844232583f53 100644
|
| --- a/android_webview/native/android_protocol_handler.cc
|
| +++ b/android_webview/browser/android_protocol_handler.cc
|
| @@ -2,14 +2,14 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "android_webview/native/android_protocol_handler.h"
|
| +#include "android_webview/browser/android_protocol_handler.h"
|
|
|
| #include <utility>
|
|
|
| +#include "android_webview/browser/input_stream_impl.h"
|
| #include "android_webview/browser/net/android_stream_reader_url_request_job.h"
|
| #include "android_webview/browser/net/aw_url_request_job_factory.h"
|
| #include "android_webview/common/url_constants.h"
|
| -#include "android_webview/native/input_stream_impl.h"
|
| #include "base/android/jni_android.h"
|
| #include "base/android/jni_string.h"
|
| #include "base/android/jni_weak_ref.h"
|
| @@ -103,8 +103,7 @@ AndroidStreamReaderURLRequestJobDelegateImpl::
|
| AndroidStreamReaderURLRequestJobDelegateImpl() {}
|
|
|
| AndroidStreamReaderURLRequestJobDelegateImpl::
|
| -~AndroidStreamReaderURLRequestJobDelegateImpl() {
|
| -}
|
| + ~AndroidStreamReaderURLRequestJobDelegateImpl() {}
|
|
|
| std::unique_ptr<InputStream>
|
| AndroidStreamReaderURLRequestJobDelegateImpl::OpenInputStream(JNIEnv* env,
|
| @@ -113,8 +112,7 @@ AndroidStreamReaderURLRequestJobDelegateImpl::OpenInputStream(JNIEnv* env,
|
| DCHECK(env);
|
|
|
| // Open the input stream.
|
| - ScopedJavaLocalRef<jstring> jurl =
|
| - ConvertUTF8ToJavaString(env, url.spec());
|
| + ScopedJavaLocalRef<jstring> jurl = ConvertUTF8ToJavaString(env, url.spec());
|
| ScopedJavaLocalRef<jobject> stream =
|
| android_webview::Java_AndroidProtocolHandler_open(env, jurl);
|
|
|
| @@ -146,8 +144,7 @@ bool AndroidStreamReaderURLRequestJobDelegateImpl::GetMimeType(
|
| // fail, as the mime type cannot be determined for all supported schemes.
|
| ScopedJavaLocalRef<jstring> url =
|
| ConvertUTF8ToJavaString(env, request->url().spec());
|
| - const InputStreamImpl* stream_impl =
|
| - InputStreamImpl::FromInputStream(stream);
|
| + const InputStreamImpl* stream_impl = InputStreamImpl::FromInputStream(stream);
|
| ScopedJavaLocalRef<jstring> returned_type =
|
| android_webview::Java_AndroidProtocolHandler_getMimeType(
|
| env, stream_impl->jobj(), url);
|
| @@ -203,8 +200,7 @@ net::URLRequestJob* AndroidRequestInterceptorBase::MaybeInterceptRequest(
|
|
|
| // AssetFileRequestInterceptor ------------------------------------------------
|
|
|
| -AssetFileRequestInterceptor::AssetFileRequestInterceptor() {
|
| -}
|
| +AssetFileRequestInterceptor::AssetFileRequestInterceptor() {}
|
|
|
| bool AssetFileRequestInterceptor::ShouldHandleRequest(
|
| const net::URLRequest* request) const {
|
| @@ -213,8 +209,7 @@ bool AssetFileRequestInterceptor::ShouldHandleRequest(
|
|
|
| // ContentSchemeRequestInterceptor --------------------------------------------
|
|
|
| -ContentSchemeRequestInterceptor::ContentSchemeRequestInterceptor() {
|
| -}
|
| +ContentSchemeRequestInterceptor::ContentSchemeRequestInterceptor() {}
|
|
|
| bool ContentSchemeRequestInterceptor::ShouldHandleRequest(
|
| const net::URLRequest* request) const {
|
|
|