Bug 703523 - #ifdef some windows and crash reporter specific parts of browser.js. r=gavin

This commit is contained in:
Mike Hommey 2012-02-27 08:23:35 +01:00
parent 0d8f2ba3a8
commit 145a32c539

View File

@ -1662,12 +1662,14 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
gDownloadMgr = Cc["@mozilla.org/download-manager;1"]. gDownloadMgr = Cc["@mozilla.org/download-manager;1"].
getService(Ci.nsIDownloadManager); getService(Ci.nsIDownloadManager);
#ifdef XP_WIN
if (Win7Features) { if (Win7Features) {
let tempScope = {}; let tempScope = {};
Cu.import("resource://gre/modules/DownloadTaskbarProgress.jsm", Cu.import("resource://gre/modules/DownloadTaskbarProgress.jsm",
tempScope); tempScope);
tempScope.DownloadTaskbarProgress.onBrowserWindowLoad(window); tempScope.DownloadTaskbarProgress.onBrowserWindowLoad(window);
} }
#endif
}, 10000); }, 10000);
#ifndef XP_MACOSX #ifndef XP_MACOSX
@ -6992,11 +6994,13 @@ function getPluginInfo(pluginElement)
var gPluginHandler = { var gPluginHandler = {
#ifdef MOZ_CRASHREPORTER
get CrashSubmit() { get CrashSubmit() {
delete this.CrashSubmit; delete this.CrashSubmit;
Cu.import("resource://gre/modules/CrashSubmit.jsm", this); Cu.import("resource://gre/modules/CrashSubmit.jsm", this);
return this.CrashSubmit; return this.CrashSubmit;
}, },
#endif
// Map the plugin's name to a filtered version more suitable for user UI. // Map the plugin's name to a filtered version more suitable for user UI.
makeNicePluginName : function (aName, aFilename) { makeNicePluginName : function (aName, aFilename) {
@ -7136,6 +7140,7 @@ var gPluginHandler = {
BrowserOpenAddonsMgr("addons://list/plugin"); BrowserOpenAddonsMgr("addons://list/plugin");
}, },
#ifdef MOZ_CRASHREPORTER
// Callback for user clicking "submit a report" link // Callback for user clicking "submit a report" link
submitReport : function(pluginDumpID, browserDumpID) { submitReport : function(pluginDumpID, browserDumpID) {
// The crash reporter wants a DOM element it can append an IFRAME to, // The crash reporter wants a DOM element it can append an IFRAME to,
@ -7144,6 +7149,7 @@ var gPluginHandler = {
if (browserDumpID) if (browserDumpID)
this.CrashSubmit.submit(browserDumpID); this.CrashSubmit.submit(browserDumpID);
}, },
#endif
// Callback for user clicking a "reload page" link // Callback for user clicking a "reload page" link
reloadPage: function (browser) { reloadPage: function (browser) {