| 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 "components/variations/android/variations_associated_data_android.h" | 5 #include "components/variations/android/variations_associated_data_android.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "components/variations/variations_associated_data.h" | 10 #include "components/variations/variations_associated_data.h" |
| 11 #include "components/variations/variations_http_header_provider.h" |
| 11 #include "jni/VariationsAssociatedData_jni.h" | 12 #include "jni/VariationsAssociatedData_jni.h" |
| 12 | 13 |
| 13 using base::android::ConvertJavaStringToUTF8; | 14 using base::android::ConvertJavaStringToUTF8; |
| 14 using base::android::ConvertUTF8ToJavaString; | 15 using base::android::ConvertUTF8ToJavaString; |
| 15 | 16 |
| 16 namespace variations { | 17 namespace variations { |
| 17 | 18 |
| 18 namespace android { | 19 namespace android { |
| 19 | 20 |
| 20 ScopedJavaLocalRef<jstring> GetVariationParamValue( | 21 ScopedJavaLocalRef<jstring> GetVariationParamValue( |
| 21 JNIEnv* env, | 22 JNIEnv* env, |
| 22 const JavaParamRef<jclass>& clazz, | 23 const JavaParamRef<jclass>& clazz, |
| 23 const JavaParamRef<jstring>& jtrial_name, | 24 const JavaParamRef<jstring>& jtrial_name, |
| 24 const JavaParamRef<jstring>& jparam_name) { | 25 const JavaParamRef<jstring>& jparam_name) { |
| 25 std::string trial_name(ConvertJavaStringToUTF8(env, jtrial_name)); | 26 std::string trial_name(ConvertJavaStringToUTF8(env, jtrial_name)); |
| 26 std::string param_name(ConvertJavaStringToUTF8(env, jparam_name)); | 27 std::string param_name(ConvertJavaStringToUTF8(env, jparam_name)); |
| 27 std::string param_value = | 28 std::string param_value = |
| 28 variations::GetVariationParamValue(trial_name, param_name); | 29 variations::GetVariationParamValue(trial_name, param_name); |
| 29 return ConvertUTF8ToJavaString(env, param_value); | 30 return ConvertUTF8ToJavaString(env, param_value); |
| 30 } | 31 } |
| 31 | 32 |
| 33 ScopedJavaLocalRef<jstring> GetFeedbackVariations( |
| 34 JNIEnv* env, |
| 35 const JavaParamRef<jclass>& clazz) { |
| 36 const std::string values = |
| 37 VariationsHttpHeaderProvider::GetInstance()->GetVariationsString(); |
| 38 return ConvertUTF8ToJavaString(env, values); |
| 39 } |
| 40 |
| 32 bool RegisterVariationsAssociatedData(JNIEnv* env) { | 41 bool RegisterVariationsAssociatedData(JNIEnv* env) { |
| 33 return RegisterNativesImpl(env); | 42 return RegisterNativesImpl(env); |
| 34 } | 43 } |
| 35 | 44 |
| 36 } // namespace android | 45 } // namespace android |
| 37 | 46 |
| 38 } // namespace variations | 47 } // namespace variations |
| OLD | NEW |