Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Side by Side Diff: chrome/browser/android/preferences/pref_service_bridge.cc

Issue 1505963002: Revert of Remove migrateNetworkPredictionPreferences(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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;
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
726 static void SetResolveNavigationErrorEnabled(JNIEnv* env, jobject obj, 748 static void SetResolveNavigationErrorEnabled(JNIEnv* env, jobject obj,
727 jboolean enabled) { 749 jboolean enabled) {
728 GetPrefService()->SetBoolean(prefs::kAlternateErrorPagesEnabled, enabled); 750 GetPrefService()->SetBoolean(prefs::kAlternateErrorPagesEnabled, enabled);
729 } 751 }
730 752
731 static jboolean GetFirstRunEulaAccepted(JNIEnv* env, jobject obj) { 753 static jboolean GetFirstRunEulaAccepted(JNIEnv* env, jobject obj) {
732 return g_browser_process->local_state()->GetBoolean(prefs::kEulaAccepted); 754 return g_browser_process->local_state()->GetBoolean(prefs::kEulaAccepted);
733 } 755 }
734 756
735 static void SetEulaAccepted(JNIEnv* env, jobject obj) { 757 static void SetEulaAccepted(JNIEnv* env, jobject obj) {
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
855 ContentSettingsType content_type) { 877 ContentSettingsType content_type) {
856 JNIEnv* env = AttachCurrentThread(); 878 JNIEnv* env = AttachCurrentThread();
857 base::android::ScopedJavaLocalRef<jstring> android_permission = 879 base::android::ScopedJavaLocalRef<jstring> android_permission =
858 Java_PrefServiceBridge_getAndroidPermissionForContentSetting( 880 Java_PrefServiceBridge_getAndroidPermissionForContentSetting(
859 env, content_type); 881 env, content_type);
860 if (android_permission.is_null()) 882 if (android_permission.is_null())
861 return std::string(); 883 return std::string();
862 884
863 return ConvertJavaStringToUTF8(android_permission); 885 return ConvertJavaStringToUTF8(android_permission);
864 } 886 }
OLDNEW
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698