Chromium Code Reviews| 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" |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 39 } | 39 } |
| 40 | 40 |
| 41 jboolean DataReductionProxySettingsAndroid::IsIncludedInAltFieldTrial( | 41 jboolean DataReductionProxySettingsAndroid::IsIncludedInAltFieldTrial( |
| 42 JNIEnv* env, jobject obj) { | 42 JNIEnv* env, jobject obj) { |
| 43 return DataReductionProxyParams::IsIncludedInAlternativeFieldTrial(); | 43 return DataReductionProxyParams::IsIncludedInAlternativeFieldTrial(); |
| 44 } | 44 } |
| 45 | 45 |
| 46 ScopedJavaLocalRef<jstring> | 46 ScopedJavaLocalRef<jstring> |
| 47 DataReductionProxySettingsAndroid::GetDataReductionProxyOrigin( | 47 DataReductionProxySettingsAndroid::GetDataReductionProxyOrigin( |
| 48 JNIEnv* env, jobject obj) { | 48 JNIEnv* env, jobject obj) { |
| 49 return ConvertUTF8ToJavaString(env, Settings()->params()->origin().spec()); | 49 return ConvertUTF8ToJavaString(env, Settings()->params()->origin().ToURI()); |
|
bengr
2015/02/04 00:49:25
#include "net/proxy/proxy_server.h"
tbansal1
2015/02/04 22:49:10
Done.
| |
| 50 } | 50 } |
| 51 | 51 |
| 52 jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyEnabled( | 52 jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyEnabled( |
| 53 JNIEnv* env, jobject obj) { | 53 JNIEnv* env, jobject obj) { |
| 54 return Settings()->IsDataReductionProxyEnabled(); | 54 return Settings()->IsDataReductionProxyEnabled(); |
| 55 } | 55 } |
| 56 | 56 |
| 57 jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyManaged( | 57 jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyManaged( |
| 58 JNIEnv* env, jobject obj) { | 58 JNIEnv* env, jobject obj) { |
| 59 return Settings()->IsDataReductionProxyManaged(); | 59 return Settings()->IsDataReductionProxyManaged(); |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 136 ProfileManager::GetActiveUserProfile()); | 136 ProfileManager::GetActiveUserProfile()); |
| 137 DCHECK(settings); | 137 DCHECK(settings); |
| 138 return settings; | 138 return settings; |
| 139 } | 139 } |
| 140 | 140 |
| 141 | 141 |
| 142 // Used by generated jni code. | 142 // Used by generated jni code. |
| 143 static jlong Init(JNIEnv* env, jobject obj) { | 143 static jlong Init(JNIEnv* env, jobject obj) { |
| 144 return reinterpret_cast<intptr_t>(new DataReductionProxySettingsAndroid()); | 144 return reinterpret_cast<intptr_t>(new DataReductionProxySettingsAndroid()); |
| 145 } | 145 } |
| OLD | NEW |