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

Bug 1228655 - Remove ifdefs for MOZ_CRASHREPORTER. r=mconley

Browse Source 
gPluginHandler.CrashSubmit appears unused
This commit is contained in:
Felipe Gomes 2015-12-01 20:05:51 -02:00
parent 64cf0b9fdc
commit 5800c4f0da
3 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
browser/base/content/browser-plugins.js
View File

@ -85,14 +85,6 @@ var gPluginHandler = {
}
},
#ifdef MOZ_CRASHREPORTER
get CrashSubmit() {
delete this.CrashSubmit;
Cu.import("resource://gre/modules/CrashSubmit.jsm", this);
return this.CrashSubmit;
},
#endif
// Callback for user clicking on a disabled plugin
managePlugins: function () {
BrowserOpenAddonsMgr("addons://list/plugin");

23
browser/base/content/browser.js
View File

@ -230,10 +230,11 @@ XPCOMUtils.defineLazyModuleGetter(this, "gWebRTCUI",
XPCOMUtils.defineLazyModuleGetter(this, "TabCrashHandler",
"resource:///modules/ContentCrashHandlers.jsm");
#ifdef MOZ_CRASHREPORTER
XPCOMUtils.defineLazyModuleGetter(this, "PluginCrashReporter",
"resource:///modules/ContentCrashHandlers.jsm");
#endif
if (AppConstants.MOZ_CRASHREPORTER) {
XPCOMUtils.defineLazyModuleGetter(this, "PluginCrashReporter",
"resource:///modules/ContentCrashHandlers.jsm");
}
XPCOMUtils.defineLazyModuleGetter(this, "FormValidationHandler",
"resource:///modules/FormValidationHandler.jsm");
@ -289,11 +290,11 @@ XPCOMUtils.defineLazyGetter(this, "Win7Features", function () {
return null;
});
#ifdef MOZ_CRASHREPORTER
XPCOMUtils.defineLazyServiceGetter(this, "gCrashReporter",
"@mozilla.org/xre/app-info;1",
"nsICrashReporter");
#endif
if (AppConstants.MOZ_CRASHREPORTER) {
XPCOMUtils.defineLazyServiceGetter(this, "gCrashReporter",
"@mozilla.org/xre/app-info;1",
"nsICrashReporter");
}
XPCOMUtils.defineLazyGetter(this, "PageMenuParent", function() {
let tmp = {};
@ -4460,8 +4461,7 @@ var XULBrowserWindow = {
else
this.asyncUpdateUI();
#ifdef MOZ_CRASHREPORTER
if (aLocationURI) {
if (AppConstants.MOZ_CRASHREPORTER && aLocationURI) {
let uri = aLocationURI.clone();
try {
// If the current URI contains a username/password, remove it.
@ -4474,7 +4474,6 @@ var XULBrowserWindow = {
// Don't make noise when the crash reporter is built but not enabled.
}
}
#endif
},
asyncUpdateUI: function () {

2
browser/base/jar.mn
View File

@ -89,7 +89,7 @@ browser.jar:
content/browser/browser-fxaccounts.js (content/browser-fxaccounts.js)
* content/browser/browser-gestureSupport.js (content/browser-gestureSupport.js)
* content/browser/browser-places.js (content/browser-places.js)
* content/browser/browser-plugins.js (content/browser-plugins.js)
content/browser/browser-plugins.js (content/browser-plugins.js)
#ifdef MOZ_SAFE_BROWSING
content/browser/browser-safebrowsing.js (content/browser-safebrowsing.js)
#endif