bug 418687 - [Mac] Firefox Menu Listing does not show Addons, Downloads, Error Console Popup Windows in PB mode, r=gavin

browser/base/content/browser.js

@@ -6934,7 +6934,15 @@ let gPrivateBrowsingUI = {
 
     this._privateBrowsingAutoStarted = this._privateBrowsingService.autoStarted;
 
-    if (!this._privateBrowsingAutoStarted) {
+    if (this._privateBrowsingAutoStarted) {
+      // Disable the menu item in auto-start mode
+      let pbMenuItem = document.getElementById("privateBrowsingItem");
+      if (pbMenuItem)
+        pbMenuItem.setAttribute("disabled", "true");
+      document.getElementById("Tools:PrivateBrowsing")
+              .setAttribute("disabled", "true");
+    }
+    else if (window.location.href == getBrowserURL()) {
       // Adjust the window's title
       let docElement = document.documentElement;
       docElement.setAttribute("title",
@@ -6943,14 +6951,6 @@ let gPrivateBrowsingUI = {
         docElement.getAttribute("titlemodifier_privatebrowsing"));
       docElement.setAttribute("browsingmode", "private");
     }
-    else {
-      // Disable the menu item in auto-start mode
-      let pbMenuItem = document.getElementById("privateBrowsingItem");
-      if (pbMenuItem)
-        pbMenuItem.setAttribute("disabled", "true");
-      document.getElementById("Tools:PrivateBrowsing")
-              .setAttribute("disabled", "true");
-    }
   },
 
   onExitPrivateBrowsing: function PBUI_onExitPrivateBrowsing() {
@@ -6968,7 +6968,7 @@ let gPrivateBrowsingUI = {
 
     this._setPBMenuTitle("start");
 
-    if (!this._privateBrowsingAutoStarted) {
+    if (window.location.href == getBrowserURL()) {
       // Adjust the window's title
       let docElement = document.documentElement;
       docElement.setAttribute("title",
@@ -6977,8 +6977,8 @@ let gPrivateBrowsingUI = {
         docElement.getAttribute("titlemodifier_normal"));
       docElement.setAttribute("browsingmode", "normal");
     }
-    else
-      this._privateBrowsingAutoStarted = false;
+
+    this._privateBrowsingAutoStarted = false;
   },
 
   _setPBMenuTitle: function PBUI__setPBMenuTitle(aMode) {