| 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" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 using base::android::ScopedJavaLocalRef; | 24 using base::android::ScopedJavaLocalRef; |
| 25 using content::BrowserThread; | 25 using content::BrowserThread; |
| 26 | 26 |
| 27 namespace android_webview { | 27 namespace android_webview { |
| 28 | 28 |
| 29 namespace { | 29 namespace { |
| 30 | 30 |
| 31 void ClientCertificatesCleared(ScopedJavaGlobalRef<jobject>* callback) { | 31 void ClientCertificatesCleared(ScopedJavaGlobalRef<jobject>* callback) { |
| 32 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 32 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 33 JNIEnv* env = AttachCurrentThread(); | 33 JNIEnv* env = AttachCurrentThread(); |
| 34 Java_AwContentsStatics_clientCertificatesCleared(env, callback->obj()); | 34 Java_AwContentsStatics_clientCertificatesCleared(env, *callback); |
| 35 } | 35 } |
| 36 | 36 |
| 37 void NotifyClientCertificatesChanged() { | 37 void NotifyClientCertificatesChanged() { |
| 38 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 38 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 39 net::CertDatabase::GetInstance()->OnAndroidKeyStoreChanged(); | 39 net::CertDatabase::GetInstance()->OnAndroidKeyStoreChanged(); |
| 40 } | 40 } |
| 41 | 41 |
| 42 } // namespace | 42 } // namespace |
| 43 | 43 |
| 44 // static | 44 // static |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 AwContentsIoThreadClientImpl::SetServiceWorkerIoThreadClient( | 85 AwContentsIoThreadClientImpl::SetServiceWorkerIoThreadClient( |
| 86 io_thread_client, browser_context); | 86 io_thread_client, browser_context); |
| 87 } | 87 } |
| 88 | 88 |
| 89 | 89 |
| 90 bool RegisterAwContentsStatics(JNIEnv* env) { | 90 bool RegisterAwContentsStatics(JNIEnv* env) { |
| 91 return RegisterNativesImpl(env); | 91 return RegisterNativesImpl(env); |
| 92 } | 92 } |
| 93 | 93 |
| 94 } // namespace android_webview | 94 } // namespace android_webview |
| OLD | NEW |