| Index: android_webview/browser/aw_web_resource_response_impl.cc
|
| diff --git a/android_webview/native/aw_web_resource_response_impl.cc b/android_webview/browser/aw_web_resource_response_impl.cc
|
| similarity index 79%
|
| rename from android_webview/native/aw_web_resource_response_impl.cc
|
| rename to android_webview/browser/aw_web_resource_response_impl.cc
|
| index b659733346a9bc4b9591d1b81bdd4d24c44e646d..238af75d6279fb2f76636d1ef66ce84ca64bb9cc 100644
|
| --- a/android_webview/native/aw_web_resource_response_impl.cc
|
| +++ b/android_webview/browser/aw_web_resource_response_impl.cc
|
| @@ -2,9 +2,9 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "android_webview/native/aw_web_resource_response_impl.h"
|
| +#include "android_webview/browser/aw_web_resource_response_impl.h"
|
|
|
| -#include "android_webview/native/input_stream_impl.h"
|
| +#include "android_webview/browser/input_stream_impl.h"
|
| #include "base/android/jni_android.h"
|
| #include "base/android/jni_array.h"
|
| #include "base/android/jni_string.h"
|
| @@ -21,11 +21,9 @@ namespace android_webview {
|
|
|
| AwWebResourceResponseImpl::AwWebResourceResponseImpl(
|
| const base::android::JavaRef<jobject>& obj)
|
| - : java_object_(obj) {
|
| -}
|
| + : java_object_(obj) {}
|
|
|
| -AwWebResourceResponseImpl::~AwWebResourceResponseImpl() {
|
| -}
|
| +AwWebResourceResponseImpl::~AwWebResourceResponseImpl() {}
|
|
|
| std::unique_ptr<InputStream> AwWebResourceResponseImpl::GetInputStream(
|
| JNIEnv* env) const {
|
| @@ -37,7 +35,7 @@ std::unique_ptr<InputStream> AwWebResourceResponseImpl::GetInputStream(
|
| }
|
|
|
| bool AwWebResourceResponseImpl::GetMimeType(JNIEnv* env,
|
| - std::string* mime_type) const {
|
| + std::string* mime_type) const {
|
| ScopedJavaLocalRef<jstring> jstring_mime_type =
|
| Java_AwWebResourceResponse_getMimeType(env, java_object_);
|
| if (jstring_mime_type.is_null())
|
| @@ -46,8 +44,8 @@ bool AwWebResourceResponseImpl::GetMimeType(JNIEnv* env,
|
| return true;
|
| }
|
|
|
| -bool AwWebResourceResponseImpl::GetCharset(
|
| - JNIEnv* env, std::string* charset) const {
|
| +bool AwWebResourceResponseImpl::GetCharset(JNIEnv* env,
|
| + std::string* charset) const {
|
| ScopedJavaLocalRef<jstring> jstring_charset =
|
| Java_AwWebResourceResponse_getCharset(env, java_object_);
|
| if (jstring_charset.is_null())
|
| @@ -81,12 +79,12 @@ bool AwWebResourceResponseImpl::GetResponseHeaders(
|
| return false;
|
| std::vector<std::string> header_names;
|
| std::vector<std::string> header_values;
|
| - AppendJavaStringArrayToStringVector(
|
| - env, jstringArray_headerNames.obj(), &header_names);
|
| - AppendJavaStringArrayToStringVector(
|
| - env, jstringArray_headerValues.obj(), &header_values);
|
| + AppendJavaStringArrayToStringVector(env, jstringArray_headerNames.obj(),
|
| + &header_names);
|
| + AppendJavaStringArrayToStringVector(env, jstringArray_headerValues.obj(),
|
| + &header_values);
|
| DCHECK_EQ(header_values.size(), header_names.size());
|
| - for(size_t i = 0; i < header_names.size(); ++i) {
|
| + for (size_t i = 0; i < header_names.size(); ++i) {
|
| std::string header_line(header_names[i]);
|
| header_line.append(": ");
|
| header_line.append(header_values[i]);
|
| @@ -95,4 +93,4 @@ bool AwWebResourceResponseImpl::GetResponseHeaders(
|
| return true;
|
| }
|
|
|
| -} // namespace android_webview
|
| +} // namespace android_webview
|
|
|