[NAVIGATOR] Revert about:logopage

projects/navigator/base/content/navigator.js

@@ -35,7 +35,6 @@ var gURIFixup = null;
 
 var gInitialPages = new Set([
   "about:blank",
-  "about:logopage",
   "about:privatebrowsing",
   "about:sessionrestore"
 ]);
@@ -1388,7 +1387,7 @@ function BrowserOpenTab()
     switch (tabPref)
     {
       default:
-        uriToLoad = "about:logopage";
+        uriToLoad = "about:blank";
         break;
       case 1:
         uriToLoad = GetLocalizedStringPref("browser.startup.homepage");

projects/navigator/base/content/tabbrowser.xml

@@ -542,9 +542,8 @@
                   // like about:privatebrowsing arrive with nsIRequest pointing to
                   // their resolved jar: or file: URIs.
                   if (!(originalLocation && gInitialPages.has(originalLocation.spec) &&
-                        originalLocation != "about:blank" && originalLocation != "about:logopage" &&
-                        this.mBrowser.currentURI && this.mBrowser.currentURI.spec == "about:blank" && 
-                        this.mBrowser.currentURI.spec == "about:logopage")) {
+                        originalLocation != "about:blank" && this.mBrowser.currentURI &&
+                        this.mBrowser.currentURI.spec == "about:blank")) {
                     // This will trigger clearing the location bar. Don't do it if
                     // we loaded off a blank browser and this is an initial page load
                     // (e.g. about:privatebrowsing, etc.) so we avoid clearing the
@@ -977,7 +976,7 @@
               aURI = aURI.spec;
             }
 
-            if (aURI == "about:blank" || aURI == "about:logopage")
+            if (aURI == "about:blank")
               return "Blank Page";
 
             // We have a URI. Let's try to unescape it using a character set
@@ -1890,7 +1889,7 @@
               case 1:
                 // add a new blank tab to replace the one we're about to close
                 // (this ensures that the remaining tab is as good as new)
-                this.addTab("about:logopage");
+                this.addTab("about:blank");
                 l++;
                 // fall through
               case 2:

projects/navigator/base/jar.mn

@@ -48,8 +48,9 @@ navigator.jar:
 
 % overlay chrome://mozapps/content/extensions/extensions.xul chrome://navigator/content/extensionsOverlay.xul
 
-toolkit.jar:
-  content/global/logopage.xhtml                                    (/mozilla/toolkit/content/logopage.xhtml)
+# XXXTobin: Logopage is busted
+#toolkit.jar:
+#  content/global/logopage.xhtml                                    (/mozilla/toolkit/content/logopage.xhtml)
 
 en-US.jar:
 % locale communicator en-US %locale/en-US/communicator/

projects/navigator/base/locale/region.properties

@@ -12,9 +12,9 @@ browser.startup.homepage=http://binaryoutcast.com/projects/borealis/
 browser.throbber.url=http://binaryoutcast.com/projects/borealis/
 startup.homepage_override_url=http://binaryoutcast.com/projects/borealis/
 #else
-browser.startup.homepage=about:logopage
-browser.throbber.url=about:logopage
-startup.homepage_override_url=about:logopage
+browser.startup.homepage=about:
+browser.throbber.url=about:
+startup.homepage_override_url=about:
 #endif
 
 browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=

projects/navigator/components/NavigatorComponents.manifest

@@ -5,7 +5,8 @@ contract @mozilla.org/network/protocol/about;1?what=feeds {8cc51368-6aa0-43e8-b7
 contract @mozilla.org/network/protocol/about;1?what=privatebrowsing {8cc51368-6aa0-43e8-b762-bde9b9fd828c}
 contract @mozilla.org/network/protocol/about;1?what=sessionrestore {8cc51368-6aa0-43e8-b762-bde9b9fd828c}
 contract @mozilla.org/network/protocol/about;1?what=steamedhams {8cc51368-6aa0-43e8-b762-bde9b9fd828c}
-contract @mozilla.org/network/protocol/about;1?what=logopage {8cc51368-6aa0-43e8-b762-bde9b9fd828c}
+# XXXTobin: Logopage is busted
+# contract @mozilla.org/network/protocol/about;1?what=logopage {8cc51368-6aa0-43e8-b762-bde9b9fd828c}
 
 component {c2343730-dc2c-11d3-98b3-001083010e9b} nsBrowserContentHandler.js
 contract @mozilla.org/uriloader/content-handler;1?type=text/html {c2343730-dc2c-11d3-98b3-001083010e9b}

projects/navigator/components/nsAboutRedirector.js

@@ -36,10 +36,12 @@ AboutRedirector.prototype = {
       url: "chrome://communicator/content/feeds/subscribe.xhtml",
       flags: (ALLOW_SCRIPT | URI_SAFE_FOR_UNTRUSTED_CONTENT | HIDE_FROM_ABOUTABOUT)
     },
+    /* XXXTobin: Logopage is busted
     "logopage": {
       url: "chrome://global/content/logopage.xhtml",
       flags: (URI_SAFE_FOR_UNTRUSTED_CONTENT | HIDE_FROM_ABOUTABOUT)
     },
+    */
     "privatebrowsing": {
       url: "chrome://communicator/content/aboutPrivateBrowsing.xul",
       flags: ALLOW_SCRIPT

projects/navigator/components/nsBrowserContentHandler.js

@@ -158,7 +158,7 @@ function getURLToLoad()
   } catch (e) {
   }
 
-  return "about:logopage";
+  return "about:blank";
 }
 
 function openWindow(parent, url, features, arg)