| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_statics.h" | 5 #include "android_webview/native/aw_contents_statics.h" |
| 6 | 6 |
| 7 #include "android_webview/browser/aw_browser_context.h" | 7 #include "android_webview/browser/aw_browser_context.h" |
| 8 #include "android_webview/browser/net/aw_url_request_context_getter.h" | 8 #include "android_webview/browser/net/aw_url_request_context_getter.h" |
| 9 #include "android_webview/common/aw_version_info_values.h" | 9 #include "android_webview/common/aw_version_info_values.h" |
| 10 #include "android_webview/native/aw_contents_io_thread_client_impl.h" | 10 #include "android_webview/native/aw_contents_io_thread_client_impl.h" |
| 11 #include "base/android/jni_string.h" | 11 #include "base/android/jni_string.h" |
| 12 #include "base/android/scoped_java_ref.h" | 12 #include "base/android/scoped_java_ref.h" |
| 13 #include "base/callback.h" | 13 #include "base/callback.h" |
| 14 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
| 15 #include "content/public/browser/storage_partition.h" | 15 #include "content/public/browser/storage_partition.h" |
| 16 #include "content/public/common/url_constants.h" | 16 #include "content/public/common/url_constants.h" |
| 17 #include "jni/AwContentsStatics_jni.h" | 17 #include "jni/AwContentsStatics_jni.h" |
| 18 #include "net/cert/cert_database.h" | 18 #include "net/cert/cert_database.h" |
| 19 | 19 |
| 20 using base::android::AttachCurrentThread; | 20 using base::android::AttachCurrentThread; |
| 21 using base::android::ConvertJavaStringToUTF8; | 21 using base::android::ConvertJavaStringToUTF8; |
| 22 using base::android::JavaParamRef; |
| 22 using base::android::ScopedJavaGlobalRef; | 23 using base::android::ScopedJavaGlobalRef; |
| 24 using base::android::ScopedJavaLocalRef; |
| 23 using content::BrowserThread; | 25 using content::BrowserThread; |
| 24 | 26 |
| 25 namespace android_webview { | 27 namespace android_webview { |
| 26 | 28 |
| 27 namespace { | 29 namespace { |
| 28 | 30 |
| 29 void ClientCertificatesCleared(ScopedJavaGlobalRef<jobject>* callback) { | 31 void ClientCertificatesCleared(ScopedJavaGlobalRef<jobject>* callback) { |
| 30 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 32 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 31 JNIEnv* env = AttachCurrentThread(); | 33 JNIEnv* env = AttachCurrentThread(); |
| 32 Java_AwContentsStatics_clientCertificatesCleared(env, callback->obj()); | 34 Java_AwContentsStatics_clientCertificatesCleared(env, callback->obj()); |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 AwContentsIoThreadClientImpl::SetServiceWorkerIoThreadClient( | 85 AwContentsIoThreadClientImpl::SetServiceWorkerIoThreadClient( |
| 84 io_thread_client, browser_context); | 86 io_thread_client, browser_context); |
| 85 } | 87 } |
| 86 | 88 |
| 87 | 89 |
| 88 bool RegisterAwContentsStatics(JNIEnv* env) { | 90 bool RegisterAwContentsStatics(JNIEnv* env) { |
| 89 return RegisterNativesImpl(env); | 91 return RegisterNativesImpl(env); |
| 90 } | 92 } |
| 91 | 93 |
| 92 } // namespace android_webview | 94 } // namespace android_webview |
| OLD | NEW |