| Index: android_webview/browser/aw_http_auth_handler.cc
|
| diff --git a/android_webview/native/aw_http_auth_handler.cc b/android_webview/browser/aw_http_auth_handler.cc
|
| similarity index 90%
|
| rename from android_webview/native/aw_http_auth_handler.cc
|
| rename to android_webview/browser/aw_http_auth_handler.cc
|
| index 263bf7f1c1f4800da7b98e0258507d795d168427..d0a22db5592c1f12de7530163e298e99740fe2bf 100644
|
| --- a/android_webview/native/aw_http_auth_handler.cc
|
| +++ b/android_webview/browser/aw_http_auth_handler.cc
|
| @@ -2,16 +2,16 @@
|
| // 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_http_auth_handler.h"
|
| +#include "android_webview/browser/aw_http_auth_handler.h"
|
|
|
| +#include "android_webview/browser/aw_contents.h"
|
| #include "android_webview/browser/aw_login_delegate.h"
|
| -#include "android_webview/native/aw_contents.h"
|
| #include "base/android/jni_android.h"
|
| #include "base/android/jni_string.h"
|
| #include "content/public/browser/browser_thread.h"
|
| +#include "content/public/browser/web_contents.h"
|
| #include "jni/AwHttpAuthHandler_jni.h"
|
| #include "net/base/auth.h"
|
| -#include "content/public/browser/web_contents.h"
|
|
|
| using base::android::ConvertJavaStringToUTF16;
|
| using base::android::JavaParamRef;
|
| @@ -27,12 +27,11 @@ AwHttpAuthHandler::AwHttpAuthHandler(AwLoginDelegate* login_delegate,
|
| realm_(auth_info->realm) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| - http_auth_handler_.Reset(
|
| - Java_AwHttpAuthHandler_create(
|
| - env, reinterpret_cast<intptr_t>(this), first_auth_attempt));
|
| + http_auth_handler_.Reset(Java_AwHttpAuthHandler_create(
|
| + env, reinterpret_cast<intptr_t>(this), first_auth_attempt));
|
| }
|
|
|
| -AwHttpAuthHandler:: ~AwHttpAuthHandler() {
|
| +AwHttpAuthHandler::~AwHttpAuthHandler() {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| Java_AwHttpAuthHandler_handlerDestroyed(base::android::AttachCurrentThread(),
|
| http_auth_handler_);
|
|
|