Bug 643301 - Toaster alert shown during startup is incorrectly positioned [r=mfinkle]

mobile/chrome/content/AlertsHelper.js

@@ -50,7 +50,9 @@ var AlertsHelper = {
 
 #ifdef ANDROID
     let offset = (window.innerWidth - container.width) / 2;
-    if (container.hasAttribute("left"))
+    if (offset < 0)
+      Cu.reportError("showAlertNotification called before the window is ready");
+    else if (container.hasAttribute("left"))
       container.setAttribute("left", offset);
     else
       container.setAttribute("right", offset);

mobile/chrome/content/browser-ui.js

@@ -531,6 +531,20 @@ var BrowserUI = {
       NewTabPopup.init();
       CharsetMenu.init();
 
+      // If some add-ons were disabled during during an application update, alert user
+      if (Services.prefs.prefHasUserValue("extensions.disabledAddons")) {
+        let addons = Services.prefs.getCharPref("extensions.disabledAddons").split(",");
+        if (addons.length > 0) {
+          let disabledStrings = Strings.browser.GetStringFromName("alertAddonsDisabled");
+          let label = PluralForm.get(addons.length, disabledStrings).replace("#1", addons.length);
+          let image = "chrome://browser/skin/images/alert-addons-30.png";
+
+          let alerts = Cc["@mozilla.org/toaster-alerts-service;1"].getService(Ci.nsIAlertsService);
+          alerts.showAlertNotification(image, Strings.browser.GetStringFromName("alertAddons"), label, false, "", null);
+        }
+        Services.prefs.clearUserPref("extensions.disabledAddons");
+      }
+
 #ifdef MOZ_UPDATER
       // Check for updates in progress
       let updatePrompt = Cc["@mozilla.org/updates/update-prompt;1"].createInstance(Ci.nsIUpdatePrompt);

mobile/chrome/content/browser.js

@@ -345,20 +345,6 @@ var Browser = {
       this.addTab(commandURL || this.getHomePage(), true);
     }
 
-    // If some add-ons were disabled during during an application update, alert user
-    if (Services.prefs.prefHasUserValue("extensions.disabledAddons")) {
-      let addons = Services.prefs.getCharPref("extensions.disabledAddons").split(",");
-      if (addons.length > 0) {
-        let disabledStrings = Strings.browser.GetStringFromName("alertAddonsDisabled");
-        let label = PluralForm.get(addons.length, disabledStrings).replace("#1", addons.length);
-        let image = "chrome://browser/skin/images/alert-addons-30.png";
-
-        let alerts = Cc["@mozilla.org/toaster-alerts-service;1"].getService(Ci.nsIAlertsService);
-        alerts.showAlertNotification(image, Strings.browser.GetStringFromName("alertAddons"), label, false, "", null);
-      }
-      Services.prefs.clearUserPref("extensions.disabledAddons");
-    }
-
     messageManager.addMessageListener("Browser:ViewportMetadata", this);
     messageManager.addMessageListener("Browser:FormSubmit", this);
     messageManager.addMessageListener("Browser:KeyPress", this);