| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "android_webview/native/aw_contents.h" | 5 #include "android_webview/native/aw_contents.h" |
| 6 | 6 |
| 7 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" | 7 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" |
| 8 #include "android_webview/native/aw_browser_dependency_factory.h" | 8 #include "android_webview/native/aw_browser_dependency_factory.h" |
| 9 #include "android_webview/native/aw_contents_container.h" | 9 #include "android_webview/native/aw_contents_container.h" |
| 10 #include "android_webview/native/aw_web_contents_delegate.h" | 10 #include "android_webview/native/aw_web_contents_delegate.h" |
| 11 #include "android_webview/native/aw_contents_io_thread_client.h" |
| 11 #include "base/android/jni_android.h" | 12 #include "base/android/jni_android.h" |
| 12 #include "base/android/jni_string.h" | 13 #include "base/android/jni_string.h" |
| 13 #include "base/bind.h" | 14 #include "base/bind.h" |
| 14 #include "base/callback.h" | 15 #include "base/callback.h" |
| 15 #include "base/supports_user_data.h" | 16 #include "base/supports_user_data.h" |
| 16 #include "content/public/browser/android/content_view_core.h" | 17 #include "content/public/browser/android/content_view_core.h" |
| 18 #include "content/public/browser/browser_thread.h" |
| 17 #include "content/public/browser/web_contents.h" | 19 #include "content/public/browser/web_contents.h" |
| 18 #include "jni/AwContents_jni.h" | 20 #include "jni/AwContents_jni.h" |
| 19 | 21 |
| 20 using base::android::AttachCurrentThread; | 22 using base::android::AttachCurrentThread; |
| 21 using base::android::ConvertUTF8ToJavaString; | 23 using base::android::ConvertUTF8ToJavaString; |
| 22 using base::android::ConvertUTF16ToJavaString; | 24 using base::android::ConvertUTF16ToJavaString; |
| 23 using base::android::ScopedJavaGlobalRef; | 25 using base::android::ScopedJavaGlobalRef; |
| 24 using base::android::ScopedJavaLocalRef; | 26 using base::android::ScopedJavaLocalRef; |
| 27 using content::BrowserThread; |
| 25 using content::ContentViewCore; | 28 using content::ContentViewCore; |
| 26 using content::WebContents; | 29 using content::WebContents; |
| 27 | 30 |
| 28 namespace android_webview { | 31 namespace android_webview { |
| 29 | 32 |
| 30 namespace { | 33 namespace { |
| 31 | 34 |
| 32 const void* kAwContentsUserDataKey = &kAwContentsUserDataKey; | 35 const void* kAwContentsUserDataKey = &kAwContentsUserDataKey; |
| 33 | 36 |
| 34 class AwContentsUserData : public base::SupportsUserData::Data { | 37 class AwContentsUserData : public base::SupportsUserData::Data { |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 const std::string& host, | 113 const std::string& host, |
| 111 const std::string& realm) { | 114 const std::string& realm) { |
| 112 JNIEnv* env = AttachCurrentThread(); | 115 JNIEnv* env = AttachCurrentThread(); |
| 113 ScopedJavaLocalRef<jstring> jhost = ConvertUTF8ToJavaString(env, host); | 116 ScopedJavaLocalRef<jstring> jhost = ConvertUTF8ToJavaString(env, host); |
| 114 ScopedJavaLocalRef<jstring> jrealm = ConvertUTF8ToJavaString(env, realm); | 117 ScopedJavaLocalRef<jstring> jrealm = ConvertUTF8ToJavaString(env, realm); |
| 115 Java_AwContents_onReceivedHttpAuthRequest(env, java_ref_.get(env).obj(), | 118 Java_AwContents_onReceivedHttpAuthRequest(env, java_ref_.get(env).obj(), |
| 116 handler.obj(), jhost.obj(), | 119 handler.obj(), jhost.obj(), |
| 117 jrealm.obj()); | 120 jrealm.obj()); |
| 118 } | 121 } |
| 119 | 122 |
| 123 void AwContents::SetIoThreadClient(JNIEnv* env, jobject obj, jobject client) { |
| 124 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 125 content::WebContents* web_contents = contents_container_->GetWebContents(); |
| 126 AwContentsIoThreadClient::Associate( |
| 127 web_contents, ScopedJavaLocalRef<jobject>(env, client)); |
| 128 } |
| 129 |
| 120 static jint Init(JNIEnv* env, | 130 static jint Init(JNIEnv* env, |
| 121 jobject obj, | 131 jobject obj, |
| 122 jobject web_contents_delegate, | 132 jobject web_contents_delegate, |
| 123 jboolean private_browsing) { | 133 jboolean private_browsing) { |
| 124 AwContents* tab = new AwContents(env, obj, web_contents_delegate, | 134 AwContents* tab = new AwContents(env, obj, web_contents_delegate, |
| 125 private_browsing); | 135 private_browsing); |
| 126 return reinterpret_cast<jint>(tab); | 136 return reinterpret_cast<jint>(tab); |
| 127 } | 137 } |
| 128 | 138 |
| 129 bool RegisterAwContents(JNIEnv* env) { | 139 bool RegisterAwContents(JNIEnv* env) { |
| 130 return RegisterNativesImpl(env) >= 0; | 140 return RegisterNativesImpl(env) >= 0; |
| 131 } | 141 } |
| 132 | 142 |
| 133 | 143 |
| 134 } // namespace android_webview | 144 } // namespace android_webview |
| OLD | NEW |