Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1122480 - Part 2 - Use Preferences.jsm in aboutTelemetry.js. r=rvitillo

Browse Source
This commit is contained in:
Georg Fritzsche 2015-05-11 19:40:23 +02:00
parent ec775ba761
commit 43cb4fc5fd
1 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
toolkit/content/aboutTelemetry.js
View File

@ -13,6 +13,7 @@ Cu.import("resource://gre/modules/TelemetryTimestamps.jsm");
Cu.import("resource://gre/modules/TelemetryController.jsm"); Cu.import("resource://gre/modules/TelemetryController.jsm");
Cu.import("resource://gre/modules/TelemetrySession.jsm"); Cu.import("resource://gre/modules/TelemetrySession.jsm");
Cu.import("resource://gre/modules/TelemetryLog.jsm"); Cu.import("resource://gre/modules/TelemetryLog.jsm");
Cu.import("resource://gre/modules/Preferences.jsm");
const Telemetry = Services.telemetry; const Telemetry = Services.telemetry;
const bundle = Services.strings.createBundle( const bundle = Services.strings.createBundle(
@ -41,30 +42,6 @@ const EOL = "\n";
// Cached value of document's RTL mode // Cached value of document's RTL mode
let documentRTLMode = ""; let documentRTLMode = "";
/**
* Helper function for fetching a config pref
*
* @param aPrefName Name of config pref to fetch.
* @param aDefault Default value to return if pref isn't set.
* @return Value of pref
*/
function getPref(aPrefName, aDefault) {
let result = aDefault;
try {
let prefType = Services.prefs.getPrefType(aPrefName);
if (prefType == Ci.nsIPrefBranch.PREF_BOOL) {
result = Services.prefs.getBoolPref(aPrefName);
} else if (prefType == Ci.nsIPrefBranch.PREF_STRING) {
result = Services.prefs.getCharPref(aPrefName);
}
} catch (e) {
// Return default if Prefs service throws exception
}
return result;
}
/** /**
* Helper function for determining whether the document direction is RTL. * Helper function for determining whether the document direction is RTL.
* Caches result of check on first invocation. * Caches result of check on first invocation.
@ -98,7 +75,7 @@ let observer = {
let enabledElement = document.getElementById("description-enabled"); let enabledElement = document.getElementById("description-enabled");
let disabledElement = document.getElementById("description-disabled"); let disabledElement = document.getElementById("description-disabled");
let toggleElement = document.getElementById("toggle-telemetry"); let toggleElement = document.getElementById("toggle-telemetry");
if (getPref(PREF_TELEMETRY_ENABLED, false)) { if (Preferences.get(PREF_TELEMETRY_ENABLED, false)) {
enabledElement.classList.remove("hidden"); enabledElement.classList.remove("hidden");
disabledElement.classList.add("hidden"); disabledElement.classList.add("hidden");
toggleElement.innerHTML = this.disableTelemetry; toggleElement.innerHTML = this.disableTelemetry;
@ -220,7 +197,7 @@ let SlowSQL = {
* Render slow SQL statistics * Render slow SQL statistics
*/ */
render: function SlowSQL_render() { render: function SlowSQL_render() {
let debugSlowSql = getPref(PREF_DEBUG_SLOW_SQL, false); let debugSlowSql = Preferences.get(PREF_DEBUG_SLOW_SQL, false);
let {mainThread, otherThreads} = let {mainThread, otherThreads} =
Telemetry[debugSlowSql ? "debugSlowSQL" : "slowSQL"]; Telemetry[debugSlowSql ? "debugSlowSQL" : "slowSQL"];
@ -465,7 +442,7 @@ function SymbolicationRequest_handleSymbolResponse() {
SymbolicationRequest.prototype.fetchSymbols = SymbolicationRequest.prototype.fetchSymbols =
function SymbolicationRequest_fetchSymbols() { function SymbolicationRequest_fetchSymbols() {
let symbolServerURI = let symbolServerURI =
getPref(PREF_SYMBOL_SERVER_URI, DEFAULT_SYMBOL_SERVER_URI); Preferences.get(PREF_SYMBOL_SERVER_URI, DEFAULT_SYMBOL_SERVER_URI);
let request = {"memoryMap" : this.memoryMap, "stacks" : this.stacks, let request = {"memoryMap" : this.memoryMap, "stacks" : this.stacks,
"version" : 3}; "version" : 3};
let requestJSON = JSON.stringify(request); let requestJSON = JSON.stringify(request);
@ -961,7 +938,7 @@ function toggleSection(aEvent) {
*/ */
function setupPageHeader() function setupPageHeader()
{ {
let serverOwner = getPref(PREF_TELEMETRY_SERVER_OWNER, "Mozilla"); let serverOwner = Preferences.get(PREF_TELEMETRY_SERVER_OWNER, "Mozilla");
let brandName = brandBundle.GetStringFromName("brandFullName"); let brandName = brandBundle.GetStringFromName("brandFullName");
let subtitleText = bundle.formatStringFromName( let subtitleText = bundle.formatStringFromName(
"pageSubtitle", [serverOwner, brandName], 2); "pageSubtitle", [serverOwner, brandName], 2);
@ -986,8 +963,8 @@ function setupListeners() {
document.getElementById("toggle-telemetry").addEventListener("click", document.getElementById("toggle-telemetry").addEventListener("click",
function () { function () {
let value = getPref(PREF_TELEMETRY_ENABLED, false); let value = Preferences.get(PREF_TELEMETRY_ENABLED, false);
Services.prefs.setBoolPref(PREF_TELEMETRY_ENABLED, !value); Preferences.set(PREF_TELEMETRY_ENABLED, !value);
}, false); }, false);
document.getElementById("chrome-hangs-fetch-symbols").addEventListener("click", document.getElementById("chrome-hangs-fetch-symbols").addEventListener("click",