summaryrefslogtreecommitdiffstats
path: root/chrome/browser/android/preferences
diff options
context:
space:
mode:
authorgayane <gayane@chromium.org>2015-04-23 15:37:07 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-23 22:37:23 +0000
commit152a1176b10452a3bffcce15abe4d82ba9cf1328 (patch)
tree15b20c367cef0e156e626eea2dbc20b5e32a242e /chrome/browser/android/preferences
parentf73c35f839eec90f43df7c2791f9030333e10a9e (diff)
downloadchromium_src-152a1176b10452a3bffcce15abe4d82ba9cf1328.zip
chromium_src-152a1176b10452a3bffcce15abe4d82ba9cf1328.tar.gz
chromium_src-152a1176b10452a3bffcce15abe4d82ba9cf1328.tar.bz2
Revert of New UMA settings fragment using Android prefs. (patchset #6 id:160001 of https://codereview.chromium.org/1080723002/)
Reason for revert: breaks clank downstream bots Original issue's description: > New UMA settings fragment using Android prefs. > > This CL is part of new UMA upload logic for 3g uploads. Previous three-option model is replaced with a new binary on/off-switch for users assigned to experimental group. > > Previous reverted CL (https://codereview.chromium.org/978623002/) used chromium preferences for the settings fragment, which caused problems. Crash reporting which also gets enabled/disabled by the same settings can not always support chromium preferences. Therefore this CL introduces new Android preferences for the new settings fragment. > > As the new logic with be enabled for users assigned to a particular experiment group, that info is also cached into Android pref so that the experiment group info can be accessible anytime. > > BUG=455847 > > Committed: https://crrev.com/a44343327c0174fbbf4f1125f3eee25977be1652 > Cr-Commit-Position: refs/heads/master@{#326612} TBR=asvitkine@chromium.org,dfalcantara@chromium.org,nyquist@chromium.org,noms@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=455847 Review URL: https://codereview.chromium.org/1101073003 Cr-Commit-Position: refs/heads/master@{#326675}
Diffstat (limited to 'chrome/browser/android/preferences')
-rw-r--r--chrome/browser/android/preferences/pref_service_bridge.cc17
1 files changed, 0 insertions, 17 deletions
diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc
index a902a04..189bab0 100644
--- a/chrome/browser/android/preferences/pref_service_bridge.cc
+++ b/chrome/browser/android/preferences/pref_service_bridge.cc
@@ -380,23 +380,6 @@ static jboolean GetFullscreenAllowed(JNIEnv* env, jobject obj) {
CONTENT_SETTINGS_TYPE_FULLSCREEN, NULL) == CONTENT_SETTING_ALLOW;
}
-static jboolean GetMetricsReportingEnabled(JNIEnv* env, jobject obj) {
- PrefService* local_state = g_browser_process->local_state();
- return local_state->GetBoolean(prefs::kMetricsReportingEnabled);
-}
-
-static void SetMetricsReportingEnabled(JNIEnv* env,
- jobject obj,
- jboolean enabled) {
- PrefService* local_state = g_browser_process->local_state();
- local_state->SetBoolean(prefs::kMetricsReportingEnabled, enabled);
-}
-
-static jboolean HasSetMetricsReporting(JNIEnv* env, jobject obj) {
- PrefService* local_state = g_browser_process->local_state();
- return local_state->HasPrefPath(prefs::kMetricsReportingEnabled);
-}
-
namespace {
// Redirects a BrowsingDataRemover completion callback back into Java.