Bug 736279 - Followup to about:home Visual Refresh. r=mak

browser/base/content/abouthome/aboutHome.css

@@ -215,6 +215,7 @@ body[dir=rtl] #defaultSnippet2 {
               0 -1px 0 hsla(0,0%,100%,.25);
 }
 
+#launcher:not([session]),
 body[narrow] #launcher[session] {
   display: block; /* display separator and restore button on separate lines */
   text-align: center;

browser/base/content/browser.js

@@ -2707,7 +2707,7 @@ function BrowserOnAboutPageLoad(document) {
     let ss = Components.classes["@mozilla.org/browser/sessionstore;1"].
              getService(Components.interfaces.nsISessionStore);
     if (!ss.canRestoreLastSession)
-      document.getElementById("sessionRestoreContainer").hidden = true;
+      document.getElementById("launcher").removeAttribute("session");
   }
 }
 
@@ -2844,7 +2844,7 @@ function BrowserOnClick(event) {
                  getService(Ci.nsISessionStore);
         if (ss.canRestoreLastSession)
           ss.restoreLastSession();
-        document.getElementById("sessionRestoreContainer").hidden = true;
+        ownerDoc.getElementById("launcher").removeAttribute("session");
       }
       else if (ot == ownerDoc.getElementById("bookmarks")) {
         PlacesCommandHook.showPlacesOrganizer("AllBookmarks");
@@ -5118,6 +5118,7 @@ var TabsProgressListener = {
     // document URI is not yet the about:-uri of the error page.
 
     if (aStateFlags & Ci.nsIWebProgressListener.STATE_STOP &&
+        Components.isSuccessCode(aStatus) &&
         /^about:/.test(aWebProgress.DOMWindow.document.documentURI)) {
       aBrowser.addEventListener("click", BrowserOnClick, false);
       aBrowser.addEventListener("pagehide", function () {

browser/locales/en-US/chrome/browser/aboutHome.dtd

@@ -22,4 +22,5 @@
 <!ENTITY abouthome.historyButton.label   "History">
 <!ENTITY abouthome.settingsButton.label  "Settings">
 <!ENTITY abouthome.addonsButton.label    "Add-ons">
+<!ENTITY abouthome.appsButton.label      "Marketplace">
 <!ENTITY abouthome.downloadsButton.label "Downloads">