| Index: android_webview/browser/aw_contents_client_bridge.cc
|
| diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/browser/aw_contents_client_bridge.cc
|
| similarity index 98%
|
| rename from android_webview/native/aw_contents_client_bridge.cc
|
| rename to android_webview/browser/aw_contents_client_bridge.cc
|
| index b85568acfba18d76c31d7308ef09d492071de735..eb4ecab7ac70783943fbdc8b4cd8df23a4616964 100644
|
| --- a/android_webview/native/aw_contents_client_bridge.cc
|
| +++ b/android_webview/browser/aw_contents_client_bridge.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/aw_contents_client_bridge.h"
|
| +#include "android_webview/browser/aw_contents_client_bridge.h"
|
|
|
| #include <memory>
|
| #include <utility>
|
|
|
| +#include "android_webview/browser/aw_contents.h"
|
| #include "android_webview/common/devtools_instrumentation.h"
|
| #include "android_webview/grit/components_strings.h"
|
| -#include "android_webview/native/aw_contents.h"
|
| #include "base/android/jni_android.h"
|
| #include "base/android/jni_array.h"
|
| #include "base/android/jni_string.h"
|
| @@ -103,8 +103,8 @@ void AwContentsClientBridge::AllowCertificateError(
|
| ScopedJavaLocalRef<jbyteArray> jcert = base::android::ToJavaByteArray(
|
| env, reinterpret_cast<const uint8_t*>(der_string.data()),
|
| der_string.length());
|
| - ScopedJavaLocalRef<jstring> jurl(ConvertUTF8ToJavaString(
|
| - env, request_url.spec()));
|
| + ScopedJavaLocalRef<jstring> jurl(
|
| + ConvertUTF8ToJavaString(env, request_url.spec()));
|
| // We need to add the callback before making the call to java side,
|
| // as it may do a synchronous callback prior to returning.
|
| int request_id = pending_cert_error_callbacks_.Add(
|
| @@ -145,8 +145,7 @@ void AwContentsClientBridge::SelectClientCertificate(
|
| // Make sure callback is run on error.
|
| base::ScopedClosureRunner guard(base::Bind(
|
| &AwContentsClientBridge::HandleErrorInClientCertificateResponse,
|
| - base::Unretained(this),
|
| - request_id));
|
| + base::Unretained(this), request_id));
|
|
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
|
| @@ -224,8 +223,7 @@ void AwContentsClientBridge::ProvideClientCertificateResponse(
|
| // Make sure callback is run on error.
|
| base::ScopedClosureRunner guard(base::Bind(
|
| &AwContentsClientBridge::HandleErrorInClientCertificateResponse,
|
| - base::Unretained(this),
|
| - request_id));
|
| + base::Unretained(this), request_id));
|
|
|
| // Convert the encoded chain to a vector of strings.
|
| std::vector<std::string> encoded_chain_strings;
|
| @@ -315,7 +313,7 @@ void AwContentsClientBridge::RunJavaScriptDialog(
|
| break;
|
| }
|
| default:
|
| - NOTREACHED();
|
| + NOTREACHED();
|
| }
|
| }
|
|
|
|
|