Bug 619764 - Fennec content process crash reporter UI does not respect MOZ_CRASHREPORTER_NO_REPORT [r=vingtetun]

This commit is contained in:
Mark Finkle 2010-12-16 18:15:55 -05:00
Родитель 663dbb5446
Коммит a79c18bf07
1 изменённых файлов: 14 добавлений и 1 удалений

Просмотреть файл

@ -2200,7 +2200,18 @@ var ContentCrashObserver = {
if (!aSubject.QueryInterface(Ci.nsIPropertyBag2).hasKey("abnormal")) if (!aSubject.QueryInterface(Ci.nsIPropertyBag2).hasKey("abnormal"))
return; return;
let dumpID = aSubject.hasKey("dumpID") ? aSubject.getProperty("dumpID") : null; // See if we should hide the UI or auto close the app based on env vars
let env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
let shutdown = env.get("MOZ_CRASHREPORTER_SHUTDOWN");
if (shutdown) {
let appStartup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup);
appStartup.quit(Ci.nsIAppStartup.eForceQuit);
return;
}
let hideUI = env.get("MOZ_CRASHREPORTER_NO_REPORT");
if (hideUI)
return;
// Spin through the open tabs and resurrect the out-of-process tabs. Resurrection // Spin through the open tabs and resurrect the out-of-process tabs. Resurrection
// does not auto-reload the content. We delay load the content as needed. // does not auto-reload the content. We delay load the content as needed.
@ -2209,6 +2220,8 @@ var ContentCrashObserver = {
aTab.resurrect(); aTab.resurrect();
}) })
let dumpID = aSubject.hasKey("dumpID") ? aSubject.getProperty("dumpID") : null;
// Execute the UI prompt after the notification has had a chance to return and close the child process // Execute the UI prompt after the notification has had a chance to return and close the child process
setTimeout(function(self) { setTimeout(function(self) {
// Ask the user if we should reload or close the current tab. Other tabs // Ask the user if we should reload or close the current tab. Other tabs