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_crash_handler.h" | 9 #include "android_webview/common/aw_crash_handler.h" |
10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
11 #include "base/android/scoped_java_ref.h" | 11 #include "base/android/scoped_java_ref.h" |
12 #include "base/callback.h" | 12 #include "base/callback.h" |
13 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_auth _request_handler.h" | 13 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_requ est_options.h" |
14 #include "content/public/browser/android/synchronous_compositor.h" | 14 #include "content/public/browser/android/synchronous_compositor.h" |
15 #include "content/public/browser/browser_thread.h" | 15 #include "content/public/browser/browser_thread.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::ScopedJavaGlobalRef; | 22 using base::android::ScopedJavaGlobalRef; |
23 using content::BrowserThread; | 23 using content::BrowserThread; |
24 using data_reduction_proxy::DataReductionProxyAuthRequestHandler; | 24 using data_reduction_proxy::DataReductionProxyRequestOptions; |
sgurun-gerrit only
2015/01/27 23:51:51
do we need this anymore?
megjablon
2015/01/31 00:44:32
Removed.
| |
25 | 25 |
26 namespace android_webview { | 26 namespace android_webview { |
27 | 27 |
28 namespace { | 28 namespace { |
29 | 29 |
30 void ClientCertificatesCleared(ScopedJavaGlobalRef<jobject>* callback) { | 30 void ClientCertificatesCleared(ScopedJavaGlobalRef<jobject>* callback) { |
31 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 31 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
32 JNIEnv* env = AttachCurrentThread(); | 32 JNIEnv* env = AttachCurrentThread(); |
33 Java_AwContentsStatics_clientCertificatesCleared(env, callback->obj()); | 33 Java_AwContentsStatics_clientCertificatesCleared(env, callback->obj()); |
34 } | 34 } |
(...skipping 18 matching lines...) Expand all Loading... | |
53 } | 53 } |
54 | 54 |
55 // static | 55 // static |
56 void SetDataReductionProxyKey(JNIEnv* env, jclass, jstring key) { | 56 void SetDataReductionProxyKey(JNIEnv* env, jclass, jstring key) { |
57 AwBrowserContext* browser_context = AwBrowserContext::GetDefault(); | 57 AwBrowserContext* browser_context = AwBrowserContext::GetDefault(); |
58 DCHECK(browser_context); | 58 DCHECK(browser_context); |
59 DCHECK(browser_context->GetRequestContext()); | 59 DCHECK(browser_context->GetRequestContext()); |
60 // The following call to GetRequestContext() could possibly be the first such | 60 // The following call to GetRequestContext() could possibly be the first such |
61 // call, which means AwURLRequestContextGetter::InitializeURLRequestContext | 61 // call, which means AwURLRequestContextGetter::InitializeURLRequestContext |
62 // will be called on IO thread as a result. InitializeURLRequestContext() | 62 // will be called on IO thread as a result. InitializeURLRequestContext() |
63 // will initialize DataReductionProxyAuthRequestHandler. | 63 // will initialize DataReductionProxyRequestOptions. |
64 AwURLRequestContextGetter* aw_url_request_context_getter = | 64 AwURLRequestContextGetter* aw_url_request_context_getter = |
65 static_cast<AwURLRequestContextGetter*>( | 65 static_cast<AwURLRequestContextGetter*>( |
66 browser_context->GetRequestContext()); | 66 browser_context->GetRequestContext()); |
67 | 67 |
68 // This PostTask has to be called after GetRequestContext, because SetKeyOnIO | 68 // This PostTask has to be called after GetRequestContext, because SetKeyOnIO |
69 // needs a valid DataReductionProxyAuthRequestHandler object. | 69 // needs a valid DataReductionProxyRequestOptions object. |
70 BrowserThread::PostTask(BrowserThread::IO, | 70 BrowserThread::PostTask(BrowserThread::IO, |
71 FROM_HERE, | 71 FROM_HERE, |
72 base::Bind(&AwURLRequestContextGetter::SetKeyOnIO, | 72 base::Bind(&AwURLRequestContextGetter::SetKeyOnIO, |
73 aw_url_request_context_getter, | 73 aw_url_request_context_getter, |
74 ConvertJavaStringToUTF8(env, key))); | 74 ConvertJavaStringToUTF8(env, key))); |
75 } | 75 } |
76 | 76 |
77 // static | 77 // static |
78 void SetDataReductionProxyEnabled(JNIEnv* env, jclass, jboolean enabled) { | 78 void SetDataReductionProxyEnabled(JNIEnv* env, jclass, jboolean enabled) { |
79 AwBrowserContext::SetDataReductionProxyEnabled(enabled); | 79 AwBrowserContext::SetDataReductionProxyEnabled(enabled); |
(...skipping 19 matching lines...) Expand all Loading... | |
99 // static | 99 // static |
100 void SetLegacyCacheRemovalDelayForTest(JNIEnv*, jclass, jlong delay_ms) { | 100 void SetLegacyCacheRemovalDelayForTest(JNIEnv*, jclass, jlong delay_ms) { |
101 AwBrowserContext::SetLegacyCacheRemovalDelayForTest(delay_ms); | 101 AwBrowserContext::SetLegacyCacheRemovalDelayForTest(delay_ms); |
102 } | 102 } |
103 | 103 |
104 bool RegisterAwContentsStatics(JNIEnv* env) { | 104 bool RegisterAwContentsStatics(JNIEnv* env) { |
105 return RegisterNativesImpl(env); | 105 return RegisterNativesImpl(env); |
106 } | 106 } |
107 | 107 |
108 } // namespace android_webview | 108 } // namespace android_webview |
OLD | NEW |