diff --git a/toolkit/content/browser-child.js b/toolkit/content/browser-child.js index 324843930deb..fffbb5200e2d 100644 --- a/toolkit/content/browser-child.js +++ b/toolkit/content/browser-child.js @@ -11,6 +11,12 @@ Cu.import('resource://gre/modules/XPCOMUtils.jsm'); Cu.import("resource://gre/modules/RemoteAddonsChild.jsm"); Cu.import("resource://gre/modules/Timer.jsm"); +#ifdef MOZ_CRASHREPORTER +XPCOMUtils.defineLazyServiceGetter(this, "CrashReporter", + "@mozilla.org/xre/app-info;1", + "nsICrashReporter"); +#endif + let FocusSyncHandler = { init: function() { sendAsyncMessage("SetSyncHandler", {}, {handler: this}); @@ -178,6 +184,10 @@ let WebNavigation = { }, loadURI: function(uri, flags) { +#ifdef MOZ_CRASHREPORTER + if (CrashReporter.enabled) + CrashReporter.annotateCrashReport("URL", uri); +#endif this._webNavigation.loadURI(uri, flags, null, null, null); }, diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index 7939efd88747..6cd3635d460b 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -27,7 +27,7 @@ toolkit.jar: content/global/directionDetector.html content/global/plugins.html content/global/plugins.css - content/global/browser-child.js (browser-child.js) +* content/global/browser-child.js (browser-child.js) content/global/browser-content.js (browser-content.js) *+ content/global/buildconfig.html (buildconfig.html) * content/global/contentAreaUtils.js (contentAreaUtils.js)