OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" | 5 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" | 9 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" |
10 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact
ory.h" | 10 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_fact
ory.h" |
11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
12 #include "chrome/browser/profiles/profile_manager.h" | 12 #include "chrome/browser/profiles/profile_manager.h" |
13 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
14 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_sett
ings.h" | 14 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_sett
ings.h" |
15 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_usag
e_stats.h" | 15 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_usag
e_stats.h" |
16 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param
s.h" | 16 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param
s.h" |
17 #include "jni/DataReductionProxySettings_jni.h" | 17 #include "jni/DataReductionProxySettings_jni.h" |
| 18 #include "net/proxy/proxy_server.h" |
18 | 19 |
19 | 20 |
20 using base::android::ConvertUTF8ToJavaString; | 21 using base::android::ConvertUTF8ToJavaString; |
21 using base::android::ScopedJavaLocalRef; | 22 using base::android::ScopedJavaLocalRef; |
22 using data_reduction_proxy::DataReductionProxyParams; | 23 using data_reduction_proxy::DataReductionProxyParams; |
23 using data_reduction_proxy::DataReductionProxySettings; | 24 using data_reduction_proxy::DataReductionProxySettings; |
24 | 25 |
25 DataReductionProxySettingsAndroid::DataReductionProxySettingsAndroid() { | 26 DataReductionProxySettingsAndroid::DataReductionProxySettingsAndroid() { |
26 } | 27 } |
27 | 28 |
(...skipping 11 matching lines...) Expand all Loading... |
39 } | 40 } |
40 | 41 |
41 jboolean DataReductionProxySettingsAndroid::IsIncludedInAltFieldTrial( | 42 jboolean DataReductionProxySettingsAndroid::IsIncludedInAltFieldTrial( |
42 JNIEnv* env, jobject obj) { | 43 JNIEnv* env, jobject obj) { |
43 return DataReductionProxyParams::IsIncludedInAlternativeFieldTrial(); | 44 return DataReductionProxyParams::IsIncludedInAlternativeFieldTrial(); |
44 } | 45 } |
45 | 46 |
46 ScopedJavaLocalRef<jstring> | 47 ScopedJavaLocalRef<jstring> |
47 DataReductionProxySettingsAndroid::GetDataReductionProxyOrigin( | 48 DataReductionProxySettingsAndroid::GetDataReductionProxyOrigin( |
48 JNIEnv* env, jobject obj) { | 49 JNIEnv* env, jobject obj) { |
49 return ConvertUTF8ToJavaString(env, Settings()->params()->origin().spec()); | 50 return ConvertUTF8ToJavaString(env, Settings()->params()->origin().ToURI()); |
50 } | 51 } |
51 | 52 |
52 jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyEnabled( | 53 jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyEnabled( |
53 JNIEnv* env, jobject obj) { | 54 JNIEnv* env, jobject obj) { |
54 return Settings()->IsDataReductionProxyEnabled(); | 55 return Settings()->IsDataReductionProxyEnabled(); |
55 } | 56 } |
56 | 57 |
57 jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyManaged( | 58 jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyManaged( |
58 JNIEnv* env, jobject obj) { | 59 JNIEnv* env, jobject obj) { |
59 return Settings()->IsDataReductionProxyManaged(); | 60 return Settings()->IsDataReductionProxyManaged(); |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 ProfileManager::GetActiveUserProfile()); | 137 ProfileManager::GetActiveUserProfile()); |
137 DCHECK(settings); | 138 DCHECK(settings); |
138 return settings; | 139 return settings; |
139 } | 140 } |
140 | 141 |
141 | 142 |
142 // Used by generated jni code. | 143 // Used by generated jni code. |
143 static jlong Init(JNIEnv* env, jobject obj) { | 144 static jlong Init(JNIEnv* env, jobject obj) { |
144 return reinterpret_cast<intptr_t>(new DataReductionProxySettingsAndroid()); | 145 return reinterpret_cast<intptr_t>(new DataReductionProxySettingsAndroid()); |
145 } | 146 } |
OLD | NEW |