From 686cdcde769fb92bfc901b2a0e7046df5f606e18 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 25 Jun 2012 13:00:32 -0400
Subject: [PATCH] Bug 767835 - Avoid using about:privatebrowsing as the new tab
 URL when permanent private browsing has been turned on; r=ttaubert

---
 browser/base/content/browser.js        | 4 ++++
 browser/base/content/utilityOverlay.js | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 6774d561f67f..4794a13bda67 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -7131,6 +7131,10 @@ let gPrivateBrowsingUI = {
       !this.privateBrowsingEnabled;
   },
 
+  get autoStarted() {
+    return this._privateBrowsingService.autoStarted;
+  },
+
   get privateBrowsingEnabled() {
     return this._privateBrowsingService.privateBrowsingEnabled;
   },
diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js
index ff0b25ae3079..1889049abdcc 100644
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -12,7 +12,9 @@ XPCOMUtils.defineLazyGetter(this, "BROWSER_NEW_TAB_URL", function () {
   const TOPIC = "private-browsing-transition-complete";
 
   function getNewTabPageURL() {
-    if (("gPrivateBrowsingUI" in window) && gPrivateBrowsingUI.privateWindow)
+    if (("gPrivateBrowsingUI" in window) &&
+        gPrivateBrowsingUI.privateWindow &&
+        !gPrivateBrowsingUI.autoStarted)
       return "about:privatebrowsing";
     else
       return Services.prefs.getCharPref(PREF) || "about:blank";