bug 311086 - safeMode dialog is shown twice when extensions are installed/removed on safe mode startup, adds final-ui-startup as an observer topic for after app restart might happen, r=bsmedberg

browser/components/nsBrowserGlue.js

@@ -60,7 +60,7 @@ BrowserGlue.prototype = {
       case "profile-change-teardown": 
         this._onProfileShutdown();
         break;
-      case "profile-after-change":
+      case "final-ui-startup":
         this._onProfileStartup();
         break;
     }
@@ -74,7 +74,7 @@ BrowserGlue.prototype = {
                            .getService(Components.interfaces.nsIObserverService);
     osvr.addObserver(this, "profile-change-teardown", false);
     osvr.addObserver(this, "xpcom-shutdown", false);
-    osvr.addObserver(this, "profile-after-change", false);
+    osvr.addObserver(this, "final-ui-startup", false);
   },
 
   // cleanup (called on application shutdown)
@@ -85,7 +85,7 @@ BrowserGlue.prototype = {
                            .getService(Components.interfaces.nsIObserverService);
     osvr.removeObserver(this, "profile-change-teardown");
     osvr.removeObserver(this, "xpcom-shutdown");
-    osvr.removeObserver(this, "profile-after-change");
+    osvr.removeObserver(this, "final-ui-startup");
   },
 
   // profile startup handler (contains profile initialization routines)

toolkit/xre/nsAppRunner.cpp

@@ -2260,6 +2260,10 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
 
         UpdatePrebinding();
 #endif
+        nsCOMPtr<nsIObserverService> obsService
+          (do_GetService("@mozilla.org/observer-service;1"));
+        if (obsService)
+          obsService->NotifyObservers(nsnull, "final-ui-startup", nsnull);        
 
         rv = cmdLine->Run();
         NS_ENSURE_SUCCESS_LOG(rv, 1);