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

Bug 801809 - Add hooks for b2g crash reporter UI. r=fabrice

Browse Source
This commit is contained in:
Margaret Leibovic 2012-10-29 11:18:50 -07:00
parent 4a49f7f2f7
commit 781742fcca
3 changed files with 57 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/app/b2g.js
View File

@ -190,7 +190,9 @@ pref("app.privacyURL", "http://www.mozilla.com/%LOCALE%/m/privacy.html");
pref("app.creditsURL", "http://www.mozilla.org/credits/");
pref("app.featuresURL", "http://www.mozilla.com/%LOCALE%/b2g/features/");
pref("app.faqURL", "http://www.mozilla.com/%LOCALE%/b2g/faq/");
pref("app.showCrashDialog", true);
// Whether we want to report crashes (headless)
//XXX Remove this pref when bug 801932 is fixed
pref("app.reportCrashes", true);
// Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror)

12
b2g/chrome/content/settings.js
View File

@ -181,3 +181,15 @@ SettingsListener.observe('debug.dev-mode', false, function(value) {
SettingsListener.observe('privacy.donottrackheader.enabled', false, function(value) {
Services.prefs.setBoolPref('privacy.donottrackheader.enabled', value);
});
// =================== Crash Reporting ====================
SettingsListener.observe('app.reportCrashes', 'ask', function(value) {
if (value == 'always') {
Services.prefs.setBoolPref('app.reportCrashes', true);
} else if (value == 'never') {
Services.prefs.setBoolPref('app.reportCrashes', false);
} else {
Services.prefs.clearUserPref('app.reportCrashes');
}
});

56
b2g/chrome/content/shell.js
View File

@ -79,19 +79,41 @@ var shell = {
crashID = Cc["@mozilla.org/xre/app-info;1"]
.getService(Ci.nsIXULRuntime).lastRunCrashID;
} catch(e) { }
if (Services.prefs.getBoolPref('app.reportCrashes') &&
crashID) {
Services.obs.addObserver(function observer(subject, topic, state) {
if (topic != "network:offline-status-changed")
return;
if (state == 'online') {
shell.CrashSubmit.submit(crashID);
Services.obs.removeObserver(observer, topic);
}
}
, "network:offline-status-changed", false);
// Bail if there isn't a valid crashID.
if (!crashID) {
return;
}
try {
// Check to see if the user has set a pref to always/never send
// crash reports. This will throw if the pref hasn't been set.
if (Services.prefs.getBoolPref("app.reportCrashes")) {
this.submitCrash(crashID);
}
// Show a banner letting the user know there was a crash.
this.sendChromeEvent({ type: "crash-banner" });
} catch (e) {
// Show a dialog only the first time there's a crash to report.
if (Services.prefs.getBoolPref("app.showCrashDialog")) {
Services.prefs.setBoolPref("app.showCrashDialog", false);
this.sendChromeEvent({ type: "crash-dialog", crashID: crashID });
} else {
// If the user hasn't set a pref, but we've already shown
// a dialog, show a banner with a "Report" button.
this.sendChromeEvent({ type: "crash-banner", crashID: crashID });
}
}
},
// This function submits a crash when we're online.
submitCrash: function shell_submitCrash(aCrashID) {
Services.obs.addObserver(function observer(subject, topic, state) {
if (state == 'online') {
shell.CrashSubmit.submit(aCrashID);
Services.obs.removeObserver(observer, topic);
}
}, "network:offline-status-changed", false);
},
get contentBrowser() {
@ -771,8 +793,6 @@ window.addEventListener('ContentStart', function ss_onContentStart() {
(function contentCrashTracker() {
Services.obs.addObserver(function(aSubject, aTopic, aData) {
let cs = Cc["@mozilla.org/consoleservice;1"]
.getService(Ci.nsIConsoleService);
let props = aSubject.QueryInterface(Ci.nsIPropertyBag2);
if (props.hasKey("abnormal") && props.hasKey("dumpID")) {
shell.reportCrash(props.getProperty("dumpID"));
@ -781,6 +801,16 @@ window.addEventListener('ContentStart', function ss_onContentStart() {
"ipc:content-shutdown", false);
})();
// Listen for crashes submitted through the crash reporter UI.
window.addEventListener('ContentStart', function cr_onContentStart() {
let content = shell.contentBrowser.contentWindow;
content.addEventListener("mozContentEvent", function cr_onMozContentEvent(e) {
if (e.detail.type == "submit-crash") {
shell.submitCrash(e.detail.crashID);
}
});
});
window.addEventListener('ContentStart', function update_onContentStart() {
let updatePrompt = Cc["@mozilla.org/updates/update-prompt;1"]
.createInstance(Ci.nsIUpdatePrompt);