wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 40520b2ca6b8 (bug 1140132)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2015-04-29 16:07:34 +02:00
parent 9aa03e428c
commit 87812cd1e8
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
toolkit/components/telemetry/TelemetryStartup.js
View File

@ -5,11 +5,10 @@
"use strict"; "use strict";
const {classes: Cc, interfaces: Ci, utils: Cu} = Components; const Cu = Components.utils;
Cu.import("resource://gre/modules/TelemetryController.jsm", this); Cu.import("resource://gre/modules/TelemetryController.jsm", this);
Cu.import("resource://gre/modules/TelemetrySession.jsm", this); Cu.import("resource://gre/modules/TelemetrySession.jsm", this);
Cu.import("resource://gre/modules/TelemetryEnvironment.jsm", this);
Cu.import("resource://gre/modules/XPCOMUtils.jsm", this); Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
/** /**
@ -20,28 +19,12 @@ function TelemetryStartup() {
} }
TelemetryStartup.prototype.classID = Components.ID("{117b219f-92fe-4bd2-a21b-95a342a9d474}"); TelemetryStartup.prototype.classID = Components.ID("{117b219f-92fe-4bd2-a21b-95a342a9d474}");
TelemetryStartup.prototype.QueryInterface = XPCOMUtils.generateQI([Components.interfaces.nsIObserver]); TelemetryStartup.prototype.QueryInterface = XPCOMUtils.generateQI([Components.interfaces.nsIObserver])
TelemetryStartup.prototype.observe = function(aSubject, aTopic, aData) { TelemetryStartup.prototype.observe = function(aSubject, aTopic, aData) {
if (aTopic == "profile-after-change" || aTopic == "app-startup") { if (aTopic == "profile-after-change" || aTopic == "app-startup") {
TelemetryController.observe(null, aTopic, null); TelemetryController.observe(null, aTopic, null);
TelemetrySession.observe(null, aTopic, null); TelemetrySession.observe(null, aTopic, null);
} }
if (aTopic == "profile-after-change") {
annotateEnvironment();
TelemetryEnvironment.registerChangeListener("CrashAnnotator", annotateEnvironment);
TelemetryEnvironment.onInitialized().then(() => annotateEnvironment());
}
}
function annotateEnvironment() {
try {
let cr = Cc["@mozilla.org/toolkit/crash-reporter;1"]
.getService(Ci.nsICrashReporter);
let env = JSON.stringify(TelemetryEnvironment.currentEnvironment);
cr.annotateCrashReport("TelemetryEnvironment", env);
} catch (e) {
// crash reporting not built or disabled? Ignore errors
}
} }
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([TelemetryStartup]); this.NSGetFactory = XPCOMUtils.generateNSGetFactory([TelemetryStartup]);