Chromium Code Reviews| 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 "chrome/browser/android/preferences/pref_service_bridge.h" | 5 #include "chrome/browser/android/preferences/pref_service_bridge.h" | 
| 6 | 6 | 
| 7 #include <jni.h> | 7 #include <jni.h> | 
| 8 | 8 | 
| 9 #include "base/android/build_info.h" | 9 #include "base/android/build_info.h" | 
| 10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" | 
| (...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 716 static void SetContextualSearchPreference(JNIEnv* env, jobject obj, | 716 static void SetContextualSearchPreference(JNIEnv* env, jobject obj, | 
| 717 jstring pref) { | 717 jstring pref) { | 
| 718 GetPrefService()->SetString(prefs::kContextualSearchEnabled, | 718 GetPrefService()->SetString(prefs::kContextualSearchEnabled, | 
| 719 ConvertJavaStringToUTF8(env, pref)); | 719 ConvertJavaStringToUTF8(env, pref)); | 
| 720 } | 720 } | 
| 721 | 721 | 
| 722 static void SetNetworkPredictionOptions(JNIEnv* env, jobject obj, int option) { | 722 static void SetNetworkPredictionOptions(JNIEnv* env, jobject obj, int option) { | 
| 723 GetPrefService()->SetInteger(prefs::kNetworkPredictionOptions, option); | 723 GetPrefService()->SetInteger(prefs::kNetworkPredictionOptions, option); | 
| 724 } | 724 } | 
| 725 | 725 | 
| 726 static jboolean NetworkPredictionEnabledHasUserSetting(JNIEnv* env, | |
| 727 jobject obj) { | |
| 728 return GetPrefService()->GetUserPrefValue( | |
| 729 prefs::kNetworkPredictionEnabled) != NULL; | |
| 
 
newt (away)
2015/09/01 18:44:39
Is kNetworkPredictionEnabled still used on other p
 
Bence
2015/09/01 20:39:59
Yes, it is still used on other platforms.  It will
 
 | |
| 730 } | |
| 731 | |
| 732 static jboolean NetworkPredictionOptionsHasUserSetting(JNIEnv* env, | |
| 733 jobject obj) { | |
| 734 return GetPrefService()->GetUserPrefValue( | |
| 735 prefs::kNetworkPredictionOptions) != NULL; | |
| 736 } | |
| 737 | |
| 738 static jboolean GetNetworkPredictionEnabledUserPrefValue(JNIEnv* env, | |
| 739 jobject obj) { | |
| 740 const base::Value* network_prediction_enabled = | |
| 741 GetPrefService()->GetUserPrefValue(prefs::kNetworkPredictionEnabled); | |
| 742 DCHECK(network_prediction_enabled); | |
| 743 bool value = false; | |
| 744 DCHECK(network_prediction_enabled->GetAsBoolean(&value)); | |
| 745 return value; | |
| 746 } | |
| 747 | |
| 748 static void SetResolveNavigationErrorEnabled(JNIEnv* env, jobject obj, | 726 static void SetResolveNavigationErrorEnabled(JNIEnv* env, jobject obj, | 
| 749 jboolean enabled) { | 727 jboolean enabled) { | 
| 750 GetPrefService()->SetBoolean(prefs::kAlternateErrorPagesEnabled, enabled); | 728 GetPrefService()->SetBoolean(prefs::kAlternateErrorPagesEnabled, enabled); | 
| 751 } | 729 } | 
| 752 | 730 | 
| 753 static jboolean GetFirstRunEulaAccepted(JNIEnv* env, jobject obj) { | 731 static jboolean GetFirstRunEulaAccepted(JNIEnv* env, jobject obj) { | 
| 754 return g_browser_process->local_state()->GetBoolean(prefs::kEulaAccepted); | 732 return g_browser_process->local_state()->GetBoolean(prefs::kEulaAccepted); | 
| 755 } | 733 } | 
| 756 | 734 | 
| 757 static void SetEulaAccepted(JNIEnv* env, jobject obj) { | 735 static void SetEulaAccepted(JNIEnv* env, jobject obj) { | 
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 877 ContentSettingsType content_type) { | 855 ContentSettingsType content_type) { | 
| 878 JNIEnv* env = AttachCurrentThread(); | 856 JNIEnv* env = AttachCurrentThread(); | 
| 879 base::android::ScopedJavaLocalRef<jstring> android_permission = | 857 base::android::ScopedJavaLocalRef<jstring> android_permission = | 
| 880 Java_PrefServiceBridge_getAndroidPermissionForContentSetting( | 858 Java_PrefServiceBridge_getAndroidPermissionForContentSetting( | 
| 881 env, content_type); | 859 env, content_type); | 
| 882 if (android_permission.is_null()) | 860 if (android_permission.is_null()) | 
| 883 return std::string(); | 861 return std::string(); | 
| 884 | 862 | 
| 885 return ConvertJavaStringToUTF8(android_permission); | 863 return ConvertJavaStringToUTF8(android_permission); | 
| 886 } | 864 } | 
| OLD | NEW |