From 990d35855b2b0309103a2268f4fc14530d29d107 Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Thu, 8 Mar 2012 08:35:15 +0100
Subject: [PATCH] Backed out changeset b5a3e22944f9 (bug 711157)

--HG--
rename : browser/base/content/abouthome/snippet1.png => browser/base/content/aboutHome-snippet1.png
rename : browser/base/content/abouthome/snippet2.png => browser/base/content/aboutHome-snippet2.png
rename : browser/base/content/abouthome/aboutHome.css => browser/base/content/aboutHome.css
rename : browser/base/content/abouthome/aboutHome.js => browser/base/content/aboutHome.js
rename : browser/base/content/abouthome/aboutHome.xhtml => browser/base/content/aboutHome.xhtml
---
 .../content/aboutHome-restore-icon-small.png  | Bin 0 -> 2321 bytes
 .../base/content/aboutHome-restore-icon.png   | Bin 0 -> 4550 bytes
 .../snippet1.png => aboutHome-snippet1.png}   | Bin
 .../snippet2.png => aboutHome-snippet2.png}   | Bin
 browser/base/content/aboutHome.css            | 384 ++++++++++++++++++
 .../base/content/{abouthome => }/aboutHome.js |  31 +-
 .../content/{abouthome => }/aboutHome.xhtml   |  67 +--
 browser/base/content/abouthome/aboutHome.css  | 362 -----------------
 browser/base/content/abouthome/addons.png     | Bin 1444 -> 0 bytes
 browser/base/content/abouthome/bookmarks.png  | Bin 1276 -> 0 bytes
 browser/base/content/abouthome/downloads.png  | Bin 898 -> 0 bytes
 browser/base/content/abouthome/history.png    | Bin 1654 -> 0 bytes
 browser/base/content/abouthome/mozilla.png    | Bin 2684 -> 0 bytes
 browser/base/content/abouthome/noise.png      | Bin 10972 -> 0 bytes
 .../base/content/abouthome/restore-large.png  | Bin 2841 -> 0 bytes
 browser/base/content/abouthome/restore.png    | Bin 1796 -> 0 bytes
 browser/base/content/abouthome/settings.png   | Bin 1557 -> 0 bytes
 browser/base/content/abouthome/sync.png       | Bin 1879 -> 0 bytes
 browser/base/content/browser-syncui.js        |  16 +
 browser/base/content/browser.js               |  67 ++-
 .../base/content/test/browser_aboutHome.js    | 111 +++++
 browser/base/jar.mn                           |  22 +-
 browser/components/about/AboutRedirector.cpp  |   2 +-
 browser/components/nsBrowserContentHandler.js |   2 +-
 .../en-US/chrome/browser/aboutHome.dtd        |  16 +-
 25 files changed, 611 insertions(+), 469 deletions(-)
 create mode 100644 browser/base/content/aboutHome-restore-icon-small.png
 create mode 100644 browser/base/content/aboutHome-restore-icon.png
 rename browser/base/content/{abouthome/snippet1.png => aboutHome-snippet1.png} (100%)
 rename browser/base/content/{abouthome/snippet2.png => aboutHome-snippet2.png} (100%)
 create mode 100644 browser/base/content/aboutHome.css
 rename browser/base/content/{abouthome => }/aboutHome.js (95%)
 rename browser/base/content/{abouthome => }/aboutHome.xhtml (58%)
 delete mode 100644 browser/base/content/abouthome/aboutHome.css
 delete mode 100644 browser/base/content/abouthome/addons.png
 delete mode 100644 browser/base/content/abouthome/bookmarks.png
 delete mode 100644 browser/base/content/abouthome/downloads.png
 delete mode 100644 browser/base/content/abouthome/history.png
 delete mode 100644 browser/base/content/abouthome/mozilla.png
 delete mode 100644 browser/base/content/abouthome/noise.png
 delete mode 100644 browser/base/content/abouthome/restore-large.png
 delete mode 100644 browser/base/content/abouthome/restore.png
 delete mode 100644 browser/base/content/abouthome/settings.png
 delete mode 100644 browser/base/content/abouthome/sync.png

diff --git a/browser/base/content/aboutHome-restore-icon-small.png b/browser/base/content/aboutHome-restore-icon-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6b80682e5f4a46023977fb26b65e36095832cce
GIT binary patch
literal 2321
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

literal 0
HcmV?d00001

diff --git a/browser/base/content/aboutHome-restore-icon.png b/browser/base/content/aboutHome-restore-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..82b2bb7f51fe39a9f2fce05d7e310c2378f46785
GIT binary patch
literal 4550
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

literal 0
HcmV?d00001

diff --git a/browser/base/content/abouthome/snippet1.png b/browser/base/content/aboutHome-snippet1.png
similarity index 100%
rename from browser/base/content/abouthome/snippet1.png
rename to browser/base/content/aboutHome-snippet1.png
diff --git a/browser/base/content/abouthome/snippet2.png b/browser/base/content/aboutHome-snippet2.png
similarity index 100%
rename from browser/base/content/abouthome/snippet2.png
rename to browser/base/content/aboutHome-snippet2.png
diff --git a/browser/base/content/aboutHome.css b/browser/base/content/aboutHome.css
new file mode 100644
index 00000000000..e96bf05a671
--- /dev/null
+++ b/browser/base/content/aboutHome.css
@@ -0,0 +1,384 @@
+%if 0
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is aboutHome.xhtml.
+ *
+ * The Initial Developer of the Original Code is the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Marco Bonardo <mak77@bonardo.net> (original author)
+ *   Mihai Sucan <mihai.sucan@gmail.com>
+ *   Stephen Horlander <shorlander@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+%endif
+
+html {
+  font-family: sans-serif;
+  background: -moz-Field;
+  color: -moz-FieldText;
+  height: 100%;
+}
+
+body {
+  display: inline-block;
+  position: relative;
+  margin: 0;
+  width: 100%;
+  height: 100%;
+}
+
+a {
+  text-decoration: none;
+}
+
+a:hover {
+  text-decoration: underline;
+}
+
+#brandStart {
+  text-align: center;
+  height: 19%;
+  max-height: 256px;
+  min-height: 92px;
+}
+
+#brandStartSpacer {
+  height: 6.5%;
+}
+
+#brandStartLogo {
+  height: 100%;
+}
+
+#searchContainer {
+  height: 15%;
+  min-height: 90px;
+}
+
+#searchContainer::before {
+  content: " ";
+  display: block;
+  height: 23%;
+}
+
+#searchForm {
+  display: table;
+  width: 100%;
+  max-width: 1830px;
+  margin: 0 auto;
+}
+
+@media all and (max-height: 700px) {
+  #searchContainer { height: 20% }
+}
+
+@media all and (max-height: 500px) {
+  #searchContainer { height: 25% }
+}
+
+@media all and (max-height: 370px) {
+  #searchContainer { height: 30% }
+}
+
+#searchLogoContainer {
+  display: table-cell;
+  width: 30%;
+  text-align: end;
+  line-height: 32px;
+}
+
+#searchEngineLogo {
+  -moz-margin-end: 2.5%;
+  vertical-align: middle;
+}
+
+#searchInputContainer {
+  display: table-cell;
+  width: 38%;
+  max-width: 700px;
+  min-width: 150px;
+}
+
+#searchText {
+  width: 100%;
+  height: 24px;
+  padding: 3px 6px;
+  border-radius: 2px;
+  border: 1px solid rgb(150,150,150);
+  border-top-color: rgb(100,100,100);
+  box-shadow: 0 1px 0 rgba(255,255,255,0.5);
+  font-size: 1.2em;
+}
+
+#searchButtons {
+  display: table-cell;
+  width: 31%;
+  -moz-padding-start: 13px;
+  vertical-align: top;
+}
+
+@media all and (max-width: 470px) {
+  #searchLogoContainer { width: 10% }
+  #searchButtons { width: 11% }
+  #searchInputContainer { width: 40% }
+}
+
+@media all and (min-width: 470px) and (max-width: 600px) {
+  #searchLogoContainer { width: 15% }
+  #searchButtons { width: 16%; white-space: nowrap }
+  #searchInputContainer { width: 45% }
+}
+
+@media all and (min-width: 600px) and (max-width: 850px) {
+  #searchLogoContainer { width: 20% }
+  #searchButtons { width: 21%; white-space: nowrap }
+  #searchInputContainer { width: 49% }
+}
+
+#searchSubmit {
+  background: -moz-linear-gradient(#f1f1f1, #dfdfdf);
+  padding: 4px 8px;
+  height: 32px;
+  border: 1px solid #ccc;
+  border-top-color: #ccc;
+  border-bottom-color: #999;
+  -moz-border-start-color: #afafaf;
+  -moz-border-end-color: #999;
+  box-shadow: 1px 1px 0 #e7e7e7,
+              0 1px 0 #fcfcfc inset,
+              0 -1px 0 #d7d7d7 inset;
+  font-size: 1em;
+  color: #000;
+  cursor: pointer;
+}
+
+body[dir=rtl] #searchSubmit {
+  box-shadow: -1px 1px 0 #e7e7e7,
+              0 1px 0 #fcfcfc inset,
+              0 -1px 0 #d7d7d7 inset;
+}
+
+#searchSubmit:active {
+  background: -moz-linear-gradient(#c5c5c5, #c5c5c5);
+  box-shadow: 1px 1px 0 #e7e7e7;
+}
+
+body[dir=rtl] #searchSubmit:active {
+  box-shadow: -1px 1px 0 #e7e7e7;
+}
+
+#contentContainer {
+  height: 30%;
+  background-image: -moz-radial-gradient(center top, ellipse farthest-side, rgba(16,83,130,.5), rgba(16,83,130,0) 75%),
+                    -moz-radial-gradient(center top, ellipse farthest-side, rgba(180,218,244,.5), rgba(180,218,244,0)),
+                    -moz-radial-gradient(center top, ellipse farthest-side, rgba(180,218,244,.3), rgba(180,218,244,0));
+  background-size: 100% 5px,
+                   100% 50px,
+                   100% 100%;
+  background-repeat: no-repeat;
+}
+
+@media all and (max-height: 400px) {
+  #contentContainer { height: 20% }
+}
+
+#snippetContainer {
+  position: relative;
+  top: -24px;
+  text-align: center;
+}
+
+#snippets {
+  display: inline-block;
+  padding: 14px;
+  width: 30%;
+  max-width: 600px;
+  background-image: -moz-linear-gradient(rgba(255,255,255,.8), rgba(255,255,255,.1));
+  background-color: rgb(250,250,250);
+  border-radius: 4px;
+  box-shadow: 0 1px 0 rgba(255,255,255,.8) inset,
+              0 -2px 0 rgba(0,0,0,.1) inset,
+              0 0 10px rgba(255,255,255,.5) inset,
+              0 0 0 1px rgba(0,0,0,.1),
+              0 2px 4px rgba(0,0,0,.2);
+  color: rgb(60,60,60);
+  font-size: .85em;
+  cursor: pointer;
+}
+
+#snippets:empty {
+  visibility: hidden;
+}
+
+@media all and (max-width: 470px) {
+  #snippets { width: 65% }
+}
+
+@media all and (min-width: 470px) and (max-width: 850px) {
+  #snippets { width: 45% }
+}
+
+#snippets:hover {
+  background-color: rgb(255,255,255);
+  box-shadow: 0 1px 0 rgba(255,255,255,.8) inset,
+              0 -2px 0 rgba(0,0,0,.1) inset,
+              0 0 10px rgba(255,255,255,.5) inset,
+              0 0 5px rgba(0,0,0,.1),
+              0 0 0 1px rgba(0,0,0,.1),
+              0 2px 4px rgba(0,0,0,.2);
+}
+
+#snippets:hover:active {
+  background-color: rgb(210,210,210);
+  box-shadow: 0 2px 3px rgba(0,0,0,.3) inset,
+              0 1px 0 rgba(255,255,255,.5);
+}
+
+#defaultSnippet1,
+#defaultSnippet2 {
+  display: table-row;
+  text-align: start;
+}
+
+#defaultSnippet1::before,
+#defaultSnippet2::before {
+  display: table-cell;
+  vertical-align: middle;
+  -moz-padding-end: 1em;
+}
+
+#defaultSnippet1::before {
+  content: url("chrome://browser/content/aboutHome-snippet1.png");
+}
+#defaultSnippet2::before {
+  content: url("chrome://browser/content/aboutHome-snippet2.png");
+}
+
+#sessionRestoreContainer {
+  padding-top: 1.5%;
+  text-align: center;
+}
+
+@media all and (max-height: 500px) {
+  #sessionRestoreContainer {
+    position: relative;
+    top: -15px;
+    padding-top: 0;
+  }
+}
+
+#restorePreviousSession {
+  padding: 10px;
+  border: 0;
+  border-radius: 4px;
+  box-shadow: 0 0 0 1px rgba(9,37,59,0),
+              0 1px 2px rgba(9,37,59,0),
+              0 0 10px rgba(255,255,255,0),
+              0 -3px 0 rgba(180,194,212,0) inset;
+  -moz-transition-property: background-color, box-shadow;
+  -moz-transition-duration: 0.25s;
+  -moz-transition-timing-function: ease-out;
+  background: transparent;
+  color: rgb(50,50,50);
+  font-weight: bold;
+  font-size: 1em;
+  cursor: pointer;
+}
+
+#restorePreviousSession::before {
+  display: inline-block;
+  content: url("chrome://browser/content/aboutHome-restore-icon.png");
+  -moz-margin-end: 10px;
+  vertical-align: middle;
+  height: 66px; /* Needed to avoid a blank space under the image */
+}
+
+body[dir=rtl] #restorePreviousSession::before {
+  -moz-transform: scaleX(-1);
+}
+
+@media all and (max-height: 500px) {
+  #restorePreviousSession::before {
+    content: url("chrome://browser/content/aboutHome-restore-icon-small.png");
+    height: 41px;
+  }
+}
+
+@media all and (max-width: 500px) {
+  #restorePreviousSession::before { 
+    content: url("chrome://browser/content/aboutHome-restore-icon-small.png");
+    height: 41px;
+  }
+}
+
+#restorePreviousSession:disabled {
+  display: none;
+}
+
+#restorePreviousSession:hover {
+  background-image: -moz-linear-gradient(rgba(255,255,255,.7), rgba(255,255,255,.2));
+  border-radius: 4px;
+  box-shadow: 0 0 0 1px rgba(9,37,59,.2),
+              0 1px 2px rgba(9,37,59,.2),
+              0 0 10px rgba(255,255,255,.4),
+              0 -3px 0 rgba(180,194,212,.3) inset;
+}
+
+#restorePreviousSession:hover:active {
+  background-image: -moz-linear-gradient(rgba(255,255,255,.0), rgba(255,255,255,.2));
+  background-color: rgba(23,75,115,.1);
+  box-shadow: 0 0 0 1px rgba(9,37,59,.2),
+              0 1px 2px rgba(9,37,59,.4) inset,
+              0 1px 5px rgba(9,37,59,.15) inset;
+}
+
+#bottomSection {
+  position: absolute;
+  color: rgb(150,150,150);
+  font-size: .8em;
+  width: 100%;
+  text-align: center;
+  bottom: 2%;
+}
+
+#syncLinksContainer {
+  padding-top: 1em;
+}
+
+.sync-link {
+  padding: 1em;
+}
+
+@media all and (max-height: 370px) {
+  #bottomSection {
+    visibility: hidden;
+  }
+}
diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/aboutHome.js
similarity index 95%
rename from browser/base/content/abouthome/aboutHome.js
rename to browser/base/content/aboutHome.js
index 96ffd85530f..54ae14b1410 100644
--- a/browser/base/content/abouthome/aboutHome.js
+++ b/browser/base/content/aboutHome.js
@@ -22,7 +22,6 @@
  * Contributor(s):
  *   Marco Bonardo <mak77@bonardo.net> (original author)
  *   Mihai Sucan <mihai.sucan@gmail.com>
- *   Frank Yan <fyan@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -156,12 +155,6 @@ function onLoad(event)
   document.getElementById("searchText").focus();
 
   loadSnippets();
-
-  fitToWidth();
-  window.addEventListener("resize", fitToWidth);
-  window.addEventListener("unload", function() {
-    window.removeEventListener("resize", fitToWidth);
-  });
 }
 
 
@@ -267,7 +260,7 @@ function showSnippets()
   let defaultSnippetsElt = document.getElementById("defaultSnippets");
   let entries = defaultSnippetsElt.querySelectorAll("span");
   // Choose a random snippet.  Assume there is always at least one.
-  let randIndex = Math.floor(Math.random() * entries.length);
+  let randIndex = Math.round(Math.random() * (entries.length - 1));
   let entry = entries[randIndex];
   // Inject url in the eventual link.
   if (DEFAULT_SNIPPETS_URLS[randIndex]) {
@@ -276,17 +269,27 @@ function showSnippets()
     // up in the translation.
     if (links.length == 1) {
       links[0].href = DEFAULT_SNIPPETS_URLS[randIndex];
+      activateSnippetsButtonClick(entry);
     }
   }
   // Move the default snippet to the snippets element.
   snippetsElt.appendChild(entry);
 }
 
-function fitToWidth() {
-  if (window.scrollMaxX) {
-    document.body.setAttribute("narrow", "true");
-  } else if (document.body.hasAttribute("narrow")) {
-    document.body.removeAttribute("narrow");
-    fitToWidth();
+/**
+ * Searches a single link element in aElt and binds its href to the click
+ * action of the snippets button.
+ *
+ * @param aElt
+ *        Element to search the link into.
+ */
+function activateSnippetsButtonClick(aElt) {
+  let links = aElt.getElementsByTagName("a");
+  if (links.length == 1) {
+    document.getElementById("snippets")
+            .addEventListener("click", function(aEvent) {
+      if (aEvent.target.nodeName != "a")
+        window.location = links[0].href;
+    }, false);
   }
 }
diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/aboutHome.xhtml
similarity index 58%
rename from browser/base/content/abouthome/aboutHome.xhtml
rename to browser/base/content/aboutHome.xhtml
index 02fa09c63b2..b6fb4ea7c4b 100644
--- a/browser/base/content/abouthome/aboutHome.xhtml
+++ b/browser/base/content/aboutHome.xhtml
@@ -25,7 +25,6 @@
 #   Marco Bonardo <mak77@bonardo.net> (original author)
 #   Mihai Sucan <mihai.sucan@gmail.com>
 #   Stephen Horlander <shorlander@mozilla.com>
-#   Frank Yan <fyan@mozilla.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -61,48 +60,52 @@
     <link rel="icon" type="image/png" id="favicon"
           href="chrome://branding/content/icon16.png"/>
     <link rel="stylesheet" type="text/css" media="all"
-          href="chrome://browser/content/abouthome/aboutHome.css"/>
+          href="chrome://browser/content/aboutHome.css"/>
 
     <script type="text/javascript;version=1.8"
-            src="chrome://browser/content/abouthome/aboutHome.js"/>
+            src="chrome://browser/content/aboutHome.js"/>
   </head>
 
   <body dir="&locale.dir;" onload="onLoad(event)">
-    <div id="container">
-      <div class="spacer"/>
-      <div id="topSection">
-        <img id="brandLogo" src="chrome://branding/content/about-logo.png" alt=""/>
+    <div id="brandStartSpacer" />
+    <div id="brandStart">
+      <img id="brandStartLogo" src="chrome://branding/content/about-logo.png" alt="" />
+    </div>
 
-        <div id="searchContainer">
-          <form name="searchForm" id="searchForm" onsubmit="onSearchSubmit(event)">
-            <div id="searchLogoContainer"><img id="searchEngineLogo"/></div>
-            <input type="text" name="q" value="" id="searchText" maxlength="256"/>
-            <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/>
-          </form>
+    <div id="searchContainer">
+      <form name="searchForm" id="searchForm" onsubmit="onSearchSubmit(event)">
+        <div id="searchLogoContainer"><img id="searchEngineLogo" /></div>
+        <div id="searchInputContainer">
+          <input type="text" name="q" value="" id="searchText" maxlength="256" />
         </div>
-
-        <div id="snippetContainer">
-          <div id="defaultSnippets" hidden="true">
-            <span id="defaultSnippet1">&abouthome.defaultSnippet1.v1;</span>
-            <span id="defaultSnippet2">&abouthome.defaultSnippet2.v1;</span>
-          </div>
-          <div id="snippets"/>
+        <div id="searchButtons">
+          <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;" />
         </div>
-      </div>
-      <div class="spacer"/>
+      </form>
+    </div>
 
-      <div id="launcher" session="true">
-        <button class="launchButton" id="bookmarks">&abouthome.bookmarksButton.label;</button>
-        <button class="launchButton" id="history">&abouthome.historyButton.label;</button>
-        <button class="launchButton" id="settings">&abouthome.settingsButton.label;</button>
-        <button class="launchButton" id="addons">&abouthome.addonsButton.label;</button>
-        <button class="launchButton" id="downloads">&abouthome.downloadsButton.label;</button>
-        <button class="launchButton" id="sync">&syncBrand.shortName.label;</button>
-        <div id="restorePreviousSessionSeparator"/>
-        <button class="launchButton" id="restorePreviousSession">&historyRestoreLastSession.label;</button>
+    <div id="contentContainer">
+      <div id="snippetContainer">
+        <div id="defaultSnippets" hidden="true">
+          <span id="defaultSnippet1">&abouthome.defaultSnippet1.v1;</span>
+          <span id="defaultSnippet2">&abouthome.defaultSnippet2.v1;</span>
+        </div>
+        <div id="snippets"/>
       </div>
 
-      <a id="aboutMozilla" href="http://www.mozilla.com/about/"/>
+      <div id="sessionRestoreContainer">
+        <button id="restorePreviousSession">&historyRestoreLastSession.label;</button>
+      </div>
+    </div>
+
+    <div id="bottomSection">
+      <div id="aboutMozilla">
+        <a href="http://www.mozilla.com/about/">&abouthome.aboutMozilla;</a>
+      </div>
+      <div id="syncLinksContainer">
+        <a href="javascript:void(0);" class="sync-link" id="setupSyncLink">&abouthome.syncSetup.label;</a>
+        <a href="javascript:void(0);" class="sync-link" id="pairDeviceLink">&abouthome.pairDevice.label;</a>
+      </div>
     </div>
   </body>
 </html>
diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css
deleted file mode 100644
index 9e0ae24f696..00000000000
--- a/browser/base/content/abouthome/aboutHome.css
+++ /dev/null
@@ -1,362 +0,0 @@
-%if 0
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is aboutHome.xhtml.
- *
- * The Initial Developer of the Original Code is the Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Marco Bonardo <mak77@bonardo.net> (original author)
- *   Mihai Sucan <mihai.sucan@gmail.com>
- *   Stephen Horlander <shorlander@mozilla.com>
- *   Frank Yan <fyan@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-%endif
-
-html {
-  font: message-box;
-  font-size: 100%;
-  background-color: hsl(0,0%,90%);
-  background-image: url(chrome://browser/content/abouthome/noise.png),
-                    -moz-linear-gradient(hsla(0,0%,100%,.7), hsla(0,0%,100%,.4));
-  background-attachment: fixed;
-  color: -moz-FieldText;
-  height: 100%;
-}
-
-body {
-  margin: 0;
-  height: 100%;
-}
-
-#container {
-  display: -moz-box;
-  -moz-box-orient: vertical;
-  width: 100%;
-  height: 100%;
-}
-
-input,
-button {
-  font-size: inherit;
-  font-family: inherit;
-}
-
-a {
-  color: -moz-nativehyperlinktext;
-  text-decoration: none;
-}
-
-.spacer {
-  -moz-box-flex: 1;
-}
-
-#topSection {
-  text-align: center;
-}
-
-#brandLogo {
-  height: 154px;
-  margin: 22px 0 31px;
-}
-
-#searchForm,
-#snippets {
-  width: 470px;
-}
-
-#searchForm {
-  display: -moz-box;
-  margin: 0 auto;
-}
-
-#searchLogoContainer {
-  display: -moz-box;
-  -moz-box-align: center;
-  padding-top: 2px;
-  -moz-padding-end: 8px;
-}
-
-#searchEngineLogo {
-  display: inline-block;
-}
-
-#searchText {
-  -moz-box-flex: 1;
-  padding: 6px 8px;
-  background: hsla(0,0%,100%,.9) padding-box;
-  border: 1px solid;
-  border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.17) hsla(210,54%,20%,.2);
-  box-shadow: 0 1px 0 hsla(210,65%,9%,.02) inset,
-              0 0 2px hsla(210,65%,9%,.1) inset,
-              0 1px 0 hsla(0,0%,100%,.2);
-  border-radius: 2.5px 0 0 2.5px;
-}
-
-body[dir=rtl] #searchText {
-  border-radius: 0 2.5px 2.5px 0;
-}
-
-#searchText:focus {
-  border-color: hsla(206,100%,60%,.6) hsla(206,76%,52%,.6) hsla(204,100%,40%,.6);
-}
-
-#searchSubmit {
-  -moz-margin-start: -1px;
-  background: -moz-linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.1)) padding-box;
-  padding: 0 9px;
-  border: 1px solid;
-  border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.17) hsla(210,54%,20%,.2);
-  -moz-border-start: 1px solid transparent;
-  border-radius: 0 2.5px 2.5px 0;
-  box-shadow: 0 0 2px hsla(0,0%,100%,.5) inset,
-              0 1px 0 hsla(0,0%,100%,.2);
-  cursor: pointer;
-  -moz-transition-property: background-color, border-color, box-shadow;
-  -moz-transition-duration: 150ms;
-}
-
-body[dir=rtl] #searchSubmit {
-  border-radius: 2.5px 0 0 2.5px;
-}
-
-#searchText:focus + #searchSubmit,
-#searchText + #searchSubmit:hover {
-  border-color: #59b5fc #45a3e7 #3294d5;
-  color: white;
-}
-
-#searchText:focus + #searchSubmit {
-  background-image: -moz-linear-gradient(#4cb1ff, #1793e5);
-  box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset,
-              0 0 0 1px hsla(0,0%,100%,.1) inset,
-              0 1px 0 hsla(210,54%,20%,.03);
-}
-
-#searchText + #searchSubmit:hover {
-  background-image: -moz-linear-gradient(#66bdff, #0d9eff);
-  box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset,
-              0 0 0 1px hsla(0,0%,100%,.1) inset,
-              0 1px 0 hsla(210,54%,20%,.03),
-              0 0 4px hsla(206,100%,20%,.2);
-}
-
-#searchText + #searchSubmit:hover:active {
-  box-shadow: 0 1px 1px hsla(211,79%,6%,.1) inset,
-              0 0 1px hsla(211,79%,6%,.2) inset;
-  -moz-transition-duration: 0ms;
-}
-
-#defaultSnippet1,
-#defaultSnippet2 {
-  display: block;
-  min-height: 38px;
-  background: 30px center no-repeat;
-  padding: 6px 0;
-  -moz-padding-start: 79px;
-}
-
-body[dir=rtl] #defaultSnippet1,
-body[dir=rtl] #defaultSnippet2 {
-  background-position: right 30px center;
-}
-
-#defaultSnippet1 {
-  background-image: url("chrome://browser/content/abouthome/snippet1.png");
-}
-
-#defaultSnippet2 {
-  background-image: url("chrome://browser/content/abouthome/snippet2.png");
-}
-
-#snippets {
-  display: inline-block;
-  text-align: start;
-  margin: 12px 0;
-  color: #3c3c3c;
-  font-size: 75%;
-}
-
-#launcher {
-  display: -moz-box;
-  -moz-box-align: center;
-  -moz-box-pack: center;
-  width: 100%;
-  background-color: hsla(0,0%,0%,.03);
-  border-top: 1px solid hsla(0,0%,0%,.03);
-  box-shadow: 0 1px 2px hsla(0,0%,0%,.02) inset,
-              0 -1px 0 hsla(0,0%,100%,.25);
-}
-
-body[narrow] #launcher[session] {
-  display: block; /* display separator and restore button on separate lines */
-  text-align: center;
-  white-space: nowrap; /* prevent navigational buttons from wrapping */
-}
-
-.launchButton {
-  display: -moz-box;
-  -moz-box-orient: vertical;
-  margin: 16px 1px;
-  padding: 14px 6px;
-  min-width: 88px;
-  max-width: 176px;
-  background: transparent padding-box;
-  border: 1px solid transparent;
-  border-radius: 2.5px;
-  color: #525c66;
-  font-size: 75%;
-  cursor: pointer;
-  -moz-transition-property: background-color, border-color, box-shadow;
-  -moz-transition-duration: 150ms;
-}
-
-body[narrow] #launcher[session] > .launchButton {
-  margin: 4px 1px;
-  max-height: 85px;
-  vertical-align: top;
-  white-space: normal;
-}
-
-.launchButton:hover {
-  background-color: hsla(211,79%,6%,.03);
-  border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.17) hsla(210,54%,20%,.2);
-}
-
-.launchButton:hover:active {
-  background-image: -moz-linear-gradient(hsla(211,79%,6%,.02), hsla(211,79%,6%,.05));
-  border-color: hsla(210,54%,20%,.2) hsla(210,54%,20%,.23) hsla(210,54%,20%,.25);
-  box-shadow: 0 1px 1px hsla(211,79%,6%,.05) inset,
-              0 0 1px hsla(211,79%,6%,.1) inset;
-  -moz-transition-duration: 0ms;
-}
-
-#launcher:not([session]) > #restorePreviousSessionSeparator,
-#launcher:not([session]) > #restorePreviousSession {
-  display: none;
-}
-
-#restorePreviousSessionSeparator {
-  width: 3px;
-  height: 116px;
-  margin: 0 10px;
-  background-image: -moz-linear-gradient(hsla(0,0%,100%,0), hsla(0,0%,100%,.35), hsla(0,0%,100%,0)),
-                    -moz-linear-gradient(hsla(211,79%,6%,0), hsla(211,79%,6%,.2), hsla(211,79%,6%,0)),
-                    -moz-linear-gradient(hsla(0,0%,100%,0), hsla(0,0%,100%,.35), hsla(0,0%,100%,0));
-  background-position: left top, center, right bottom;
-  background-size: 1px auto;
-  background-repeat: no-repeat;
-}
-
-body[narrow] #restorePreviousSessionSeparator {
-  margin: 0 auto;
-  width: 512px;
-  height: 3px;
-  background-image: -moz-linear-gradient(0, hsla(0,0%,100%,0), hsla(0,0%,100%,.35), hsla(0,0%,100%,0)),
-                    -moz-linear-gradient(0, hsla(211,79%,6%,0), hsla(211,79%,6%,.2), hsla(211,79%,6%,0)),
-                    -moz-linear-gradient(0, hsla(0,0%,100%,0), hsla(0,0%,100%,.35), hsla(0,0%,100%,0));
-  background-size: auto 1px;
-}
-
-#restorePreviousSession {
-  max-width: none;
-  font-size: 90%;
-}
-
-body[narrow] #restorePreviousSession {
-  font-size: 80%;
-}
-
-.launchButton::before {
-  display: block;
-  margin-bottom: 6px;
-  line-height: 0; /* remove extra vertical space due to non-zero font-size */
-}
-
-#bookmarks::before {
-  content: url("chrome://browser/content/abouthome/bookmarks.png");
-}
-
-#history::before {
-  content: url("chrome://browser/content/abouthome/history.png");
-}
-
-#settings::before {
-  content: url("chrome://browser/content/abouthome/settings.png");
-}
-
-#addons::before {
-  content: url("chrome://browser/content/abouthome/addons.png");
-}
-
-#downloads::before {
-  content: url("chrome://browser/content/abouthome/downloads.png");
-}
-
-#sync::before {
-  content: url("chrome://browser/content/abouthome/sync.png");
-}
-
-#restorePreviousSession::before {
-  content: url("chrome://browser/content/abouthome/restore-large.png");
-  display: inline-block; /* display on same line as text label */
-  vertical-align: middle;
-  margin-bottom: 0;
-  -moz-margin-end: 8px;
-}
-
-body[dir=rtl] #restorePreviousSession::before {
-  -moz-transform: scaleX(-1);
-}
-
-body[narrow] #restorePreviousSession::before {
-  content: url("chrome://browser/content/abouthome/restore.png");
-}
-
-#aboutMozilla {
-  display: block;
-  position: relative; /* pin wordmark to edge of document, not of viewport */
-  -moz-box-ordinal-group: 0;
-  opacity: .5;
-  -moz-transition: opacity 150ms;
-}
-
-#aboutMozilla:hover {
-  opacity: 1;
-}
-
-#aboutMozilla::before {
-  content: url("chrome://browser/content/abouthome/mozilla.png");
-  display: block;
-  position: absolute;
-  top: 12px;
-  right: 12px;
-}
diff --git a/browser/base/content/abouthome/addons.png b/browser/base/content/abouthome/addons.png
deleted file mode 100644
index 41519ce4982a0385b7668eaad8c20e1d06070b7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1444
zcmV;V1zY-wP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%MoC0LR9M5+msw0yR~W}_oBG%{pPQyW
z7}KOSJT$T3N>M}<6&Us)%Z$jtFayIZch);|@66oUR~Q&TmX<|g!$VD46GHI8Hce|y
zO=;g~OoM1`o7Ae2G+)2(hM5i{57%TcDakMQaF%=i=R5!JoIAUA{U830me-vut!i1S
zXt?wUS;O+pqvf^7UdiOe=Niw{EBZif5rA>UM5tWTu7Trc8xHKafCfeHmqwh_KQs;D
z(W@d<?q`EgCszwQE}+NcTIM2S5E+}#Kq4&OLC~|l;EoGOUYRjlak9|JTt+}(cm_=F
z*ux)w{Q2OH3jlz({fY4<VPGn=1r(8)YoGhDZTBlNVmLWrb%sZ9@;MQkZxCF;!OFZ%
zP*hsA|4?al!J$*t1x2OR2eRt-l$>vBRP@;%(5h)02uCOdtt!)R*ruT|g(oZD*zCVI
z{T`%DvVe*@`B3%6Zm5^{LQPu_R5o|Pg{DriELU4-zrl-J5K7I8P?_p3_1S?^v<myv
z7+Gr%)M0wowyB|_UU6Hp0ENc<m7WWOJuoDO*Ww)zp)wa41@GV#8gCkcsTmO}`;wmk
z9~~3NShM=m|3*Fn8WVq0vVhAv_MR(tMSO8SAQ1*<U{<n#E<N{`keGx39x(a9A`F0;
z5BsDGFmV5n0Dtn+ykK(2L2vV#B@5^_@*Bdyq`0s7z~qTTx1J4U&w*J{dE|7B^Kh9=
zi&^u|76EFD=b<}3E}D(-Bqo47K?bBJiA%Rhfjl7BSk{Uw8p?1&S(&W$cCB0kE!{?F
z>eRv6dc{K&v_B)j!iR2Hgao+I)f^r;W>0)Wh>hMFo|v1*=QnnAw}%9h5DCzG^v)2p
zsTgSKGJuM4iD_&1C&i4xh{L(Yj;k2~zuf!vV^?Ts$?T4<dSfGtckcdV#AEg-@;-9h
zpBP(o1cyPu$Vh?2@)$izOEHykQB;?1qq>$Z{iE#j{!OG1IgfmVyp_F0k>rGqaYb?P
zL|)*+qjZRENH(c~^)>ag0a3kFXd5VMEc$_>;YKf|+njimtBl;*mPravT#%tLl7~vG
zn1dzfx45)LsSD~ILGdM05Pjs1J)fLg7@z&@`Vhm1|Ddqb#3YLR;fs%4$xLvhOeU{t
zR>DQ49vVBebdEnp_jaJDg5ziEn$f+_(k7JxO~!|kOSqN$kaySaKWO*GM!v8K@fC|Z
zx-vR7KaTb9Wdzi;cCYl}cb*j|LFJ$^dqgp{co~t4`|W<9OkmN)1cxi(ag{Dg(`_)|
z3i-eQpXIUL$cM=3P4;aGf2)ewpcJ9KqVQ3eXvK7?kooAz`Uh5oXlhxAjVzm7(e<>u
zX-qDCHXkq!U#Ilju-7W?54|uK%3C3lTHaJ%L_GfcNrT;+xSJM{3q?@Fa0=<Sq1OJ~
zfo`SH=3>Na+RO(NIiG2-b9gvlB(@zx0+d>-TDpLK+n;tnxpepijC>gV(0?bp|KYOg
zJ<UqpI^&9LJEqqvz~w%(Q~GVFV^_(5PTc!ksJ^|&1jov2W$FH>sxDqv>KtIh?b&XO
z7Cj*EF{WPPdw~7k<c^~GhF*XTBtdO<gRDil@ZXOW&F=;-B(`lgM&}6NryR2&{l|yF
zd4u+ve2|9HjaF#Et5t=Uhk^Ab)BW{!VUbozZRzyP9!G~(yUO^rWC1#>C)KHA#e65U
zb{{>TFkEQW=81kgK7B1k7gM_b)2Gi4rzYpdvF$s(Bd|_lGGno<wR!I=)Xc4y`SI}q
yBF~|D^KvRi_U80|ZS#~XL29-cTaBEMGWWm2aTm|u=>tjt0000<MNUMnLSTZ;x6I7|

diff --git a/browser/base/content/abouthome/bookmarks.png b/browser/base/content/abouthome/bookmarks.png
deleted file mode 100644
index 5c7e194a61c1e669b24c382603269a093989f517..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1276
zcmV<Y1OxktP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000ETNkl<Zc-qC5
zYfPJE6vz8b6E9P;O`>KW{op4P6J!B81jcoY%55<2TFRwR3!|l_w9vQhTUvT=DYQVj
z?7|$&V$3o#B%4E+gn({16tkEZql+I*jBKfd#T?IhMS@y{7SIpB0MB{O|NPH$d*K1V
z|4P^i@#zJ;gp2}S;)$ZD)VzvCWFCJ%fMXcjmc21>EUSnoD6Ji8P#8ems)wAC8ZVCh
zHwLKF<8PH8sX5cRX7r2z>mCMCvt|{?qA|Ab2C(~6yuvC;pOSThWAGA(l666TrP#^G
zSbTc^zp-lr*nL^FsJUact7jBkLzlrB7zbJj91Erh$_`<d`)eStLhMu+Twot~kBW2H
z`Y%GO-U)dX_1*kTT!pm!E!d@j6hY~s>LzuNbr0dvlYvVF_dAUVF_w~362*0!mKTcM
z8OX&BTXhbw`p0PRH^Ys|F(xRj(<fvU^5U>q2qHI-oKu3`Yk~%60PMKr4%~vx&=|#p
z()NeRCr=-U--Q9XYOmwtQiekMwEW5|*~QgM<@It<b$P(zJCFN+F(eeD8&Os#1IoeN
zaneAo)1<lOA>?Nk#^C;rpC}S8=a$z)adi_^HYh-JrUN7@BghyVbXfYp+<O+6`T`!h
zv5-*A<Q=8Clta0sL0X(9X=fD)m#7xjd~L%3zG^?!$rzAnZJ;uGpwr?5ovoi+Qd7?e
zboZVEs}BqN$94qGrJOF$2x*WOX_7Wqqqap0f|8mC8wMI%nQv%<3GcS0?>q_Y3#3go
zH0EAtkTc6025!%NUZ*m;e=&N7p}X%K?d85e+Ek;Bb^d(!-d9zd58<<)%+4#@jP4b@
z&opsgKy5mtEAw~0Xa<0%{(cLhZcfi?RIDp#Bon=7_Y~F@0MvdoJ-g6G4R3V~4^DhM
zqi<tfYm{L2j_wJhg_^<1Ter2;=yvbG3s<k->~3S-Yk%B=(Op3rN`q_d!^tTFY9HR|
zOZejD53W1#U_Qp}psN@WluH`#Uz@a`X7sVl!mys=BbJ`P1Y`5#eIAYot<?wi-r=jL
z^)ereA59U2_bq5tFxS+k9_l0_)cABul)5WP*~MJ(*yNn>42Y!d_cdg|6^IDR6-ib1
z60=TG@$e1cxBpjMMmoh2LAlt(Lt241usE`F1Ne`{OSLVXptI9AVK5>nmo)HG9>p0*
zI=OQLr6Orsqe2gQGT;~p1;w_FlSV;BJwG;F165*~tV!JkdPo01U~E26n>_TU2iuLV
zRgJla#zM}Owj1H?26@BL;{skxQufXb2pbiHvQ7(iu>oWCaR*DTwXT`n10Q|=;79Sd
z-~AvlIs0$m*kg+6Z2rIGv~+X>YI);Qb9pguhGF0xiDF8jx8pwgx$ZP(Ds1`9VDFn=
zTE5=`0I|pu$dgFi;+J15bXM<-oUy|Cig3B~xA0x%L_&Igcm}Gaszrs){%6OaHG3BD
zE2hR6A9<PtX<zAn^D_!4=NTk%ZsBf6r^)?UD`Vqw>8DVloX0ug8DMQ*Z=*uDqUmzp
zxivFK?|2IG90^fT659-otv|KTBdIs0K4sgDjzzJYd1Q9^ZQ&XqUPa20H00p=7>R5J
mo$}2_4kPJE1@g*PXW)02(gT@f=I})T0000<MNUMnLSTZFLTTOr

diff --git a/browser/base/content/abouthome/downloads.png b/browser/base/content/abouthome/downloads.png
deleted file mode 100644
index 3d4d10e7abb472690b37dbd8cea26c79ec8205ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 898
zcmV-|1AY97P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80009?Nkl<Zc-qyM
z%TE(g6vm116(5QEzqoKEaVH^>D2N6W!B8WlQh~mN&UE^qkLk2SdDHUr0irJ5xR4bD
zO$kUVg|wy>(^6WRX<4`clIuN9N-$1f3Ns6D@=KcD@1FCWd(XX1i;Di2alQ2ZwVM@n
zD|c!dQTZb|FE9rh(28!LyzW`JnRFn6?nji<!wbxT2DG9ZXiyuGW8e*PkGw}+qaS#I
zInaPsbOTUX=kU8+l7j#ZXhk>BN->8f&jVV~4YcT)Ty;VKtpo<(2&M!9T1k3<9hwq^
zBt6hf(1`WE6$EHSH}IUWBbRql5TF&^fI??OPS1oOKr6n1c5Gm9LJ*)8-9S^D6*2gg
z69Q-@Fkr#Y>}x@QR+1*9`(Fv7;3h0CsbotkYBRU0o}e-w9z0c|HcJ<x`(6qHw6KOR
z7UU?sTlc%T^xov2fvS3iU#>MHjfq8CbLT(kY(1#MJ&f$V<AMM!tl^6VITY<yR4r?c
z?irYwo0lmmCT(<ik+pja*?Pt$0b-ljA*9kXTc1A9wCov3rBWAt-~3G)GmA}luy7PF
z7!wtUX=1&22VB|NIiEJ0&0hJd55UCYQc$ijI#UMcAhL9g<Q9nm#Dc<9MkYJ^bwQcQ
zWG?eIV=|e%5LjMq)S6rg12d32OIUmyAO;kqHaIy*&T-tO18+nkkvJb*4a?M&BThN`
zQAg(xvVf5z0BfNTHN|lA3x36+$@3!?i=7LFqK~obHInW_W*i7ADFj$U;p8d<lZNDQ
z#09+#kx1lhFdVK`QOp`)@69z31Qh~k^?3J`lq0>k^j%(X^8F?vk)Jhc0~00iy*A-S
zGJ}x=0F55+no93TL2~G;V?Dv4Q0PqbSG-zlWPa#u-ME_vafKdUV2-4Fk&2=>pqY=I
zJU;?~!0FifdZpIj4C$=c1nz36bU*MNiH}ODrxX6=l?G^LQGbklKHsTiI$f?YFu^v9
z8(*z~T*Ux<hTTz;ws;^ImWiG`Kc=UrPi|~(-Ubsd@VgFY4Og|T!;M-AYaDNTJ=`Ek
z|D=Kmj@v4;yS*P<2|L$9*tc{R_DeXjRx5e({2)p4#P;^~)!p6QD$K*3ot+!dtVfCU
Y2Tou=l3c_Nga7~l07*qoM6N<$f;t<JX#fBK

diff --git a/browser/base/content/abouthome/history.png b/browser/base/content/abouthome/history.png
deleted file mode 100644
index ae742b1aa8acd6115533186c86f7ac37828681f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1654
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
AM*si-

diff --git a/browser/base/content/abouthome/mozilla.png b/browser/base/content/abouthome/mozilla.png
deleted file mode 100644
index f2c348d13566a943593afc93934e5503661deaa9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2684
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

diff --git a/browser/base/content/abouthome/noise.png b/browser/base/content/abouthome/noise.png
deleted file mode 100644
index 9ff785adae87b120fa0eb264982c3ea21810745d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10972
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

diff --git a/browser/base/content/abouthome/restore-large.png b/browser/base/content/abouthome/restore-large.png
deleted file mode 100644
index ef593e6e14c87b6774b39361f9ce31b1c908dbed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2841
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

diff --git a/browser/base/content/abouthome/restore.png b/browser/base/content/abouthome/restore.png
deleted file mode 100644
index 5c3d6f4376c24bfe320ccac1e2b09f896c83a2a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1796
zcmV+f2mAPmP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU&rb$FWR9M5+S7}UCR~WU6CPtgKCbd6X
zn>6Y6!$#YrE~R4KSQHQ$bOc7E4nh$ShJjfehFRY18w0bzfWs=#s#O~k(^d^lqtVtz
zjK+{O){rzJXt9PEExG;9>%5n#MTF{~lALgJzwey$-S6Fd-<w&p{!f3Oq+}<oNz37q
zB?V_UO6BJ>a*O{2Fvc8W$a$)!A16uXuHLj=k+yyJaBi`Z6)6p@vewCJOg^TuHZrX(
zz*OdXehx9@AQv2PpU6CMqg0ZfTlA~EqL!&RKQnq;m_5+J?7>cc>~HP;$sX*u?{4m4
zuBHQg4D-kZhq^NajsIl6HY1mleO|+=O<rcM-_Ky;iS#l@sEgIPn(lQUI^Mz<TdTD;
zjAITlZ%ZE!<bne(G@v#8mM2S|OUlaclULR<y{m~|8AM@VX=r0+PxIAFR|XYi{wDG{
zZ_^1^u>G9L+dOLWwX*nPz=a01pb72A7O;NH4z8%mz_$`Bi8Fr??)dUB8K)9n5b|lf
zjIf%p?c9X{y|=036m@9A87l-D(1Iqkr*3<CPWor%T4wMx6A>%#<$<x$8@Xq1h$yDw
zQxOXYD}ElhqBXd~L)OMNDx!zyLlfHMkvS=ORqD0{(!$Ey`|Lr!b*Nr|unKIfb(u2T
z$_-g!D-)6=GD70Y4O`~K74p*X$gS<1ulXY9k1}DCLK`0N`d0y)q;g}0&cPhC!#&t=
zac~nEE!B}gAr+A#Dfl)aDeD#R(sPRLNOx7RG-=@<iK$!n#uYL9w;RLhdPiUgrvp0B
zh6lVJI&RzM<nK|9QJbmKZoXxc!5Qx2Te(NgvCVnK*XaWKuvE>B>l{I*G<w+1G7UD{
zsf1+7BB6->Gv~|p*%~Lng*H6k1y8X6BBhjREOfp*_@t=-A(O9#RqCCrL}j|Kvj-*|
zp-!G#=L)lu8WUYag_o#^`LQBi=Dgw4TzxCgM;^T3DHf1dq-ayq<$*T4!rhMr@~k+L
zbnI-6?II8VO|(}~M6x8`D(D|OaWY2}(+A)MPq6^`UfqDf-6SSV7kH+?!*hCP7#Gm^
zs?@D>g)UUpxkiOz;RR2zfZbJfW9E8XB7e8i(h%j_3}B2o#HI@zKkSn<seHZQp*FeC
zK@V|w!BZ@tSZR157$M0SZ2Pgj??^P#b+E_ciwuH**mPkFv@=>Ulb5S21rMd(epF9;
zL|7m^#R5vIjSs9SfQWi$h-o?R5o+68g!lZB&U&4#k&n#;)dn}K(3;hPN4ds)h&C)A
zgBLu-0!nL4cd$!s)Vf+aQYF=fej#S_g=JU`Vl#n)P6_7@$iyxyYWq<DV(@~eSU`o=
zGHCQf_?=DnI9)cn8$#^D#mjG$Yb|%N;}M?@kP8mDf(|sHjX1pEDHfnIx{jebw8lgi
z1w9|OCOzk)*baW);t3r=+~VKQ=S&6U@VUeR7aF9s7@E*V4&v|>3-E=a3MD-=v<5)S
zCHW=2Lj0F&*AuD@t|9CX#9=ZS5JL`f!4ddbJ4$+>Dd@uso?-#Fe;->^rsnS8d?Eq+
zfUe7lRVmqvg)4R7^3`2h&UckQK&XYyqL=`z4l(2)7aaa2M;g$=s*wjSyx<xC8hyqc
zXzkK)^~_8{CQ7Q**;!^@@!*Pen_rCO%)_@pQ(JGhvd(!Ixi}pF#+VC5dwOEu3-iDM
z7aGulCbW_3Y=|6y=RaOZ!y}_hDs{F|+~;Px3(y5Tw`9rA)63Uwo*!52yM(-x-=8%{
zI=^TKFvc8?t&j&!N_N3XXg~{^(1yp&ky}eA`<Qq(+I`T4XN5<BR-vWx3LPV%%gfhh
zyz@~0Lc-fIER2sKH$}2@09@gbK@-~WfY+nGXkK^tBS%&AF=<2*1g*u-imU4II2gU}
zo0qLgU-GCgBE*n`TyW5CK?j=9hR3YOd{!;hS$$_!W-qlYM3sl>*fi32znvA7sadA1
zm?dr5G4$ys>2ca%Apm2{A%+~}f&(rzpao56PwUH=5)+*bEk~8qGCe&%13kMsT+!5x
zD!SoHRc2gPte{lQ17pk~h8*OA11>b61<e`#E<m+?Umb5y=<Q<~OFeC*0KXbQ?+mhi
zHac=vKM#yCC&ZBp4!F>m_R1$I;<cM2qXphj^l(+J<2GI}!ttx6bB&b(7z@V{ImiVE
zTxdMe&of*og!c*3@A}V}shwYI%$_T1ljoX3?-&O##vEeboch6n+!$x}Q~jYDJ9-}w
mQV1CYSqvGmImBL_iRNE?brB92^z8Nk0000<MNUMnLSTY?a9BqG

diff --git a/browser/base/content/abouthome/settings.png b/browser/base/content/abouthome/settings.png
deleted file mode 100644
index 4b0c30990933f748f41f8424ff81bd0622c05b18..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1557
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
Hu0mjf%%}sx

diff --git a/browser/base/content/abouthome/sync.png b/browser/base/content/abouthome/sync.png
deleted file mode 100644
index 11e40cc93755ab65b0dcd4a51a58c87f6c096278..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1879
zcmV-d2dMaoP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU&`AI}UR9M5!S7}UCR}{8VZEa0kZQ9uW
zXn&Y!+Qg)38>3aQD6$I_fq`L%Vc(Y-*4c;I_kn?7hD8yy2x$a=XlkuNEhbFV)YfWg
z4JBHOU@NquLdfkoPv7{^8K|^BO7bOd-n;jl?`+?_EL-+}{@W1}yLnf5d}&}*N@r+n
zhBGWa%Nd!N`v5SF&!H@iGhlCW+s-g{;*Jp3y8q0v@1D4gfl;Z$aT%o~t5ise`6|Mb
z8c4O=Lip-N3i!;G7)W7_f}|JKlBkpd;vboGgtp-w6tfPndPxKbA+I?vepe_^TgMgk
z`-s-oMfCPV#MshJOs$70;4{9%ZxVxpl#4WDgF_b*asRG}g#3tv?CCIe*67Z#_`qi-
z00vej=ke@9Z4>3l+}7g}2FK?_q-&n}X6QmW5MK>h$Vn@xCY5z2!h;MY=T%^4jL%Sa
z)+%6rx}aJ?FnWyElXLtgx3rU%&fX4iz6OYIN-e0G5$l_Q*dd~C?jmBHjbxRJNN{wj
z!zVb#YhmZXEU)nRtdoT`O3E-sN2lB!F#STcb@Z>hcQ@gFR(kQ#D!G{|4ZQ|!$V{yy
zhbtk_SLy``1VyLv@+)N!c{`*Yop*Z#ewP~Tq_wM8579pt5Sg?&vxH9+K-`4A!hit?
zNuf_N;QQ`~ME5<hD=dCpN<r0qT!^f(_DtYAO;aaPSv!cX`5+a2jlwcMHTCBP+%Hy{
zwoA3vGa{XBPHXF=N`NG3=<NrIK+{OrnWYmjWlv8B^o|OfMhAwCNPq!7IIJ_Z5KTk-
z`4a=@^kQA}TpgrUWp;dl(Lb7;H2|N%p^FkAF^)vB6iA$gy72%h5okzwd?t6Ea}W}*
z)WYfs88|_v$esrNmKq(z+IFZ99QXs?)?3?-m5H>ZxBqyIn-P9}_}VWyLUrSq8c1OJ
zX<#4{y`7}wRg6OxR=PHYu+sdCYn8yTgK|hi2VGoeZY2t{<185dkY0at?3PcNKy?|T
z_Mjs#4Ga!(K}Tk>988<&qX@(+I3_LBwIL~o>p*40^dn0e7y%#Zd}ngX?+FLbU%oON
zw}_anRhjHx%PnnGAT*E=^bSeR<+ivMXO{|`P*;io6Zp<z?`Q*K%iTD5aWPHl>gms@
zRn~*8&Uui4PQb)mdQ6~PbO%$7>}Y734v-4a|C6T&cP#Zx85^H?t6ZeLkD1iM1ksS2
z+emh~c+#~nuTuIz*|3jtN<(GckNQ4|^;{|eoRBhsdQ1t5s(}fhfxq*3(plHSf=bz}
z3JE}i&`^RHmGYIp{o9kZs78JR`v9Ad1_oPDRX6i^QB~cP0vAElH1Ky`g=B8`XNfD9
z>Kyj2LL2UEqfghuGQM(HW^5s<hW##Jnu_5}*b~d~T`GaFSPr`c?h=?y%rFfZ=t{Xj
z^@D3+wM>6h2r|iBgs7AmNgSuBe=$c}{32d`@||~3v==+GWCTYJ2`~ZrK&m9#qprnf
z+deLKJf?=Z5RXz$Q4Im5+_~^68q>YaKXP8F;BczV<w>ZKL%U4yBzj`DwLg~Qk<shx
zOZdu3Jl&WJQU8$`E4^sKCn$QOJLjK<u-1mfWz718$5*+obfK|{Nx57Q95aku3)pIP
zL1wgr63VB)zcRdmIWEif*4EBiNS7R(Dk%AV2nl4N7^E{gCI5FI5%N@><2W2naV<&6
zD!UK*{t;Yab?{6@iM5u44JI)CBDLits_8sKSAV*;rL<N#g(+ihz${=Xu$kgAO7MF1
z71Woz)h~j&-LNx?om{bwz`T=`{7Qmk&^g+{y-Z++%Y^E=-o9f=?nGlnXHTC2Q;rLn
z8!-|jflY~*j+m7EK@=I^J+U8Pj|eqZ_})Znl@^Gw0rsPF$2?%_@w-T6K8@#uC*^uq
zWokZN4Hrrok^sj{h~bh7<(NKo<{Sst?@h`XC=+TZ!bs8+@H?iSC)Qpcz5Z*!f+ID3
z@7`9Z(O|XQ1ZlKU%n=wNSEQLc*xPRcqOU-svC|8y2_Fs{B<l%MD1|`PfO9`K{PRc}
zW_nTm2KXurwi6XlON?3s8o?E5XL^ntGh>#v1w_8VN-Mn06>BMym~wZ(Z<uzmrvChm
zn`3GJ<OF3B`2=n}mU5x`k5Ykh^2<|arSR?@Xuj2;jzjqsQoIpU5qbhnP)(h2+<D;=
z8}>fCq@%-I6Svc$ZrSksCOBWYJ0hVM#|*mpVbei+kq9;-HXvVBPjH-T;CfyO4V?r3
z6NIxffAkKFdVi@$>I%RMv|a%Gt`1-0bsp|(mK&N*DNMEjzS4BLN~RwXsx05ijkW=}
zGxj?=x;vm`4d<K}g|H{a)Aensq+SNB2W$s;1A+mOfWSw;KL)&q{j!+jzX31oW@7ok
RBdh=b002ovPDHLkV1m-`bcp}}

diff --git a/browser/base/content/browser-syncui.js b/browser/base/content/browser-syncui.js
index f0472457f49..5c26adb0ca9 100644
--- a/browser/base/content/browser-syncui.js
+++ b/browser/base/content/browser-syncui.js
@@ -175,7 +175,21 @@ let gSyncUI = {
     this.clearError(title);
   },
 
+  // Set visibility of "Setup Sync" link
+  showSetupSyncAboutHome: function SUI_showSetupSyncAboutHome(toShow) {
+    let browsers = gBrowser.browsers;
+    for (let i = 0; i < browsers.length; i++) {
+      let b = browsers[i];
+      if ("about:home" == b.currentURI.spec) {
+        b.contentDocument.getElementById("setupSyncLink").hidden = !toShow;
+      }
+    }
+  },
+
   onSetupComplete: function SUI_onSetupComplete() {
+    // Remove "setup sync" link in about:home if it is open. 
+    this.showSetupSyncAboutHome(false);
+
     onLoginFinish();
   },
 
@@ -223,6 +237,8 @@ let gSyncUI = {
 
   onStartOver: function SUI_onStartOver() {
     this.clearError();
+    // Make "setup sync" link visible in about:home if it is open. 
+    this.showSetupSyncAboutHome(true);
   },
 
   onQuotaNotice: function onQuotaNotice(subject, data) {
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 26537d51741..9d302b99196 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -56,7 +56,6 @@
 #   Patrick Walton <pcwalton@mozilla.com>
 #   Mihai Sucan <mihai.sucan@gmail.com>
 #   Victor Porof <vporof@mozilla.com>
-#   Frank Yan <fyan@mozilla.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -2750,7 +2749,11 @@ function BrowserOnAboutPageLoad(document) {
     let ss = Components.classes["@mozilla.org/browser/sessionstore;1"].
              getService(Components.interfaces.nsISessionStore);
     if (!ss.canRestoreLastSession)
-      document.getElementById("launcher").removeAttribute("session");
+      document.getElementById("sessionRestoreContainer").hidden = true;
+    // Sync-related links
+    if (Services.prefs.prefHasUserValue("services.sync.username")) {
+      document.getElementById("setupSyncLink").hidden = true;
+    }
   }
 }
 
@@ -2758,17 +2761,19 @@ function BrowserOnAboutPageLoad(document) {
  * Handle command events bubbling up from error page content
  */
 function BrowserOnClick(event) {
-    if (!event.isTrusted || // Don't trust synthetic events
-        event.button == 2 || event.target.localName != "button")
+    // Don't trust synthetic events
+    if (!event.isTrusted ||
+        (event.target.localName != "button" &&
+         event.target.className != "sync-link"))
       return;
 
     var ot = event.originalTarget;
-    var ownerDoc = ot.ownerDocument;
+    var errorDoc = ot.ownerDocument;
 
     // If the event came from an ssl error page, it is probably either the "Add
     // Exception…" or "Get me out of here!" button
-    if (/^about:certerror/.test(ownerDoc.documentURI)) {
-      if (ot == ownerDoc.getElementById('exceptionDialogButton')) {
+    if (/^about:certerror/.test(errorDoc.documentURI)) {
+      if (ot == errorDoc.getElementById('exceptionDialogButton')) {
         var params = { exceptionAdded : false, handlePrivateBrowsing : true };
 
         try {
@@ -2776,7 +2781,7 @@ function BrowserOnClick(event) {
             case 2 : // Pre-fetch & pre-populate
               params.prefetchCert = true;
             case 1 : // Pre-populate
-              params.location = ownerDoc.location.href;
+              params.location = errorDoc.location.href;
           }
         } catch (e) {
           Components.utils.reportError("Couldn't get ssl_override pref: " + e);
@@ -2787,22 +2792,22 @@ function BrowserOnClick(event) {
 
         // If the user added the exception cert, attempt to reload the page
         if (params.exceptionAdded)
-          ownerDoc.location.reload();
+          errorDoc.location.reload();
       }
-      else if (ot == ownerDoc.getElementById('getMeOutOfHereButton')) {
+      else if (ot == errorDoc.getElementById('getMeOutOfHereButton')) {
         getMeOutOfHere();
       }
     }
-    else if (/^about:blocked/.test(ownerDoc.documentURI)) {
+    else if (/^about:blocked/.test(errorDoc.documentURI)) {
       // The event came from a button on a malware/phishing block page
       // First check whether it's malware or phishing, so that we can
       // use the right strings/links
-      var isMalware = /e=malwareBlocked/.test(ownerDoc.documentURI);
+      var isMalware = /e=malwareBlocked/.test(errorDoc.documentURI);
 
-      if (ot == ownerDoc.getElementById('getMeOutButton')) {
+      if (ot == errorDoc.getElementById('getMeOutButton')) {
         getMeOutOfHere();
       }
-      else if (ot == ownerDoc.getElementById('reportButton')) {
+      else if (ot == errorDoc.getElementById('reportButton')) {
         // This is the "Why is this site blocked" button.  For malware,
         // we can fetch a site-specific report, for phishing, we redirect
         // to the generic page describing phishing protection.
@@ -2812,7 +2817,7 @@ function BrowserOnClick(event) {
           // append the current url, and go there.
           try {
             let reportURL = formatURL("browser.safebrowsing.malware.reportURL", true);
-            reportURL += ownerDoc.location.href;
+            reportURL += errorDoc.location.href;
             content.location = reportURL;
           } catch (e) {
             Components.utils.reportError("Couldn't get malware report URL: " + e);
@@ -2826,7 +2831,7 @@ function BrowserOnClick(event) {
           }
         }
       }
-      else if (ot == ownerDoc.getElementById('ignoreWarningButton')) {
+      else if (ot == errorDoc.getElementById('ignoreWarningButton')) {
         // Allow users to override and continue through to the site,
         // but add a notify bar as a reminder, so that they don't lose
         // track after, e.g., tab switching.
@@ -2881,31 +2886,23 @@ function BrowserOnClick(event) {
         );
       }
     }
-    else if (/^about:home$/i.test(ownerDoc.documentURI)) {
-      if (ot == ownerDoc.getElementById("restorePreviousSession")) {
+    else if (/^about:home$/i.test(errorDoc.documentURI)) {
+      if (ot == errorDoc.getElementById("restorePreviousSession")) {
         let ss = Cc["@mozilla.org/browser/sessionstore;1"].
                  getService(Ci.nsISessionStore);
         if (ss.canRestoreLastSession)
           ss.restoreLastSession();
-        ownerDoc.getElementById("launcher").removeAttribute("session");
+        errorDoc.getElementById("sessionRestoreContainer").hidden = true;
       }
-      else if (ot == ownerDoc.getElementById("bookmarks")) {
-        PlacesCommandHook.showPlacesOrganizer("AllBookmarks");
+      else if (ot == errorDoc.getElementById("pairDeviceLink")) {
+        if (Services.prefs.prefHasUserValue("services.sync.username")) {
+          gSyncUI.openAddDevice();
+        } else {
+          gSyncUI.openSetup("pair");
+        }
       }
-      else if (ot == ownerDoc.getElementById("history")) {
-        PlacesCommandHook.showPlacesOrganizer("History");
-      }
-      else if (ot == ownerDoc.getElementById("settings")) {
-        openPreferences();
-      }
-      else if (ot == ownerDoc.getElementById("addons")) {
-        BrowserOpenAddonsMgr();
-      }
-      else if (ot == ownerDoc.getElementById("downloads")) {
-        BrowserDownloadsUI();
-      }
-      else if (ot == ownerDoc.getElementById("sync")) {
-        openPreferences("paneSync");
+      else if (ot == errorDoc.getElementById("setupSyncLink")) {
+        gSyncUI.openSetup(null);
       }
     }
 }
diff --git a/browser/base/content/test/browser_aboutHome.js b/browser/base/content/test/browser_aboutHome.js
index 21e18059979..6ecb364ecbf 100644
--- a/browser/base/content/test/browser_aboutHome.js
+++ b/browser/base/content/test/browser_aboutHome.js
@@ -116,6 +116,117 @@ let gTests = [
     executeSoon(runNextTest);
   }
 },
+
+{
+  desc: "Check sync links visibility before and after Sync setup",
+  setup: function ()
+  {
+    try {
+      Services.prefs.clearUserPref("services.sync.username");
+    } catch (ex) {}
+    Services.obs.notifyObservers(null, "weave:service:ready", null);
+  },
+  run: function ()
+  {
+    let doc = gBrowser.selectedTab.linkedBrowser.contentDocument;
+    let pairLink = doc.getElementById("pairDeviceLink");
+    let setupLink = doc.getElementById("setupSyncLink");
+
+    ok(pairLink, "Found 'Pair Device' link");
+    ok(setupLink, "Found 'Set Up Sync' link");
+    ok(!pairLink.hidden, "'Pair' link is visible before setup");
+    ok(!setupLink.hidden, "'Set Up' link is visible before setup");
+
+    Services.obs.notifyObservers(null, "weave:service:setup-complete", null);
+
+    executeSoon(function () {
+      setupLink = doc.getElementById("setupSyncLink");
+      ok(setupLink.hidden, "'Set Up' link is hidden after setup");
+      ok(!pairLink.hidden, "'Pair' link is visible after setup");
+
+      executeSoon(runNextTest);
+    });
+  }
+},
+
+{
+  desc: "Check sync links visibility before and after Sync unlink",
+  setup: function ()
+  {
+    Services.prefs.setCharPref("services.sync.username", "someuser@domain.com");
+    Services.obs.notifyObservers(null, "weave:service:ready", null);
+  },
+  run: function ()
+  {
+    let doc = gBrowser.selectedTab.linkedBrowser.contentDocument;
+    let pairLink = doc.getElementById("pairDeviceLink");
+    let setupLink = doc.getElementById("setupSyncLink");
+
+    ok(!pairLink.hidden, "'Pair' link is visible before unlink");
+    ok(setupLink.hidden, "'Set Up' link is hidden before unlink");
+
+    Services.obs.notifyObservers(null, "weave:service:start-over", null);
+
+    executeSoon(function () {
+      setupLink = doc.getElementById("setupSyncLink");
+      ok(!setupLink.hidden, "'Set Up' link is visible after unlink");
+      ok(!pairLink.hidden, "'Pair' link is visible after unlink");
+      executeSoon(runNextTest);
+    });
+  }
+},
+
+{
+  desc: "Check Pair Device link opens correct dialog with Sync account ",
+  setup: function ()
+  {
+    Services.prefs.setCharPref("services.sync.username", "someuser@domain.com");
+    Services.obs.notifyObservers(null, "weave:service:ready", null);
+  },
+  run: function ()
+  {
+    expectDialogWindow("Sync:AddDevice");
+    let browser = gBrowser.selectedTab.linkedBrowser;
+    let button = browser.contentDocument.getElementById("pairDeviceLink");
+    EventUtils.sendMouseEvent({type: "click"}, button, browser.contentWindow);
+  }
+},
+
+{
+  desc: "Check Pair Device link opens correct dialog without Sync account",
+  setup: function ()
+  {
+    try {
+      Services.prefs.clearUserPref("services.sync.username");
+    } catch (ex) {}
+    Services.obs.notifyObservers(null, "weave:service:ready", null);
+  },
+  run: function ()
+  {
+    expectDialogWindow("Weave:AccountSetup");
+    let browser = gBrowser.selectedTab.linkedBrowser;
+    let button = browser.contentDocument.getElementById("pairDeviceLink");
+    EventUtils.sendMouseEvent({type: "click"}, button, browser.contentWindow);
+  }
+},
+
+{
+  desc: "Check Sync Setup link opens correct dialog (without Sync account)",
+  setup: function ()
+  {
+    try {
+      Services.prefs.clearUserPref("services.sync.username");
+    } catch (ex) {}
+    Services.obs.notifyObservers(null, "weave:service:ready", null);
+  },
+  run: function ()
+  {
+    expectDialogWindow("Weave:AccountSetup");
+    let browser = gBrowser.selectedTab.linkedBrowser;
+    let button = browser.contentDocument.getElementById("setupSyncLink");
+    EventUtils.sendMouseEvent({type: "click"}, button, browser.contentWindow);
+  }
+},
 ];
 
 function test()
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index 072b7038967..984a5376f44 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -16,21 +16,13 @@ browser.jar:
 *       content/browser/aboutDialog.js                (content/aboutDialog.js)
 *       content/browser/aboutDialog.css               (content/aboutDialog.css)
 *       content/browser/aboutRobots.xhtml             (content/aboutRobots.xhtml)
-*       content/browser/abouthome/aboutHome.xhtml     (content/abouthome/aboutHome.xhtml)
-*       content/browser/abouthome/aboutHome.js        (content/abouthome/aboutHome.js)
-*       content/browser/abouthome/aboutHome.css       (content/abouthome/aboutHome.css)
-        content/browser/abouthome/snippet1.png        (content/abouthome/snippet1.png)
-        content/browser/abouthome/snippet2.png        (content/abouthome/snippet2.png)
-        content/browser/abouthome/bookmarks.png       (content/abouthome/bookmarks.png)
-        content/browser/abouthome/history.png         (content/abouthome/history.png)
-        content/browser/abouthome/settings.png        (content/abouthome/settings.png)
-        content/browser/abouthome/addons.png          (content/abouthome/addons.png)
-        content/browser/abouthome/downloads.png       (content/abouthome/downloads.png)
-        content/browser/abouthome/sync.png            (content/abouthome/sync.png)
-        content/browser/abouthome/restore.png         (content/abouthome/restore.png)
-        content/browser/abouthome/restore-large.png   (content/abouthome/restore-large.png)
-        content/browser/abouthome/mozilla.png         (content/abouthome/mozilla.png)
-        content/browser/abouthome/noise.png           (content/abouthome/noise.png)
+*       content/browser/aboutHome.xhtml               (content/aboutHome.xhtml)
+*       content/browser/aboutHome.js                  (content/aboutHome.js)
+*       content/browser/aboutHome.css                 (content/aboutHome.css)
+        content/browser/aboutHome-restore-icon.png    (content/aboutHome-restore-icon.png)
+        content/browser/aboutHome-restore-icon-small.png    (content/aboutHome-restore-icon-small.png)
+        content/browser/aboutHome-snippet1.png        (content/aboutHome-snippet1.png)
+        content/browser/aboutHome-snippet2.png        (content/aboutHome-snippet2.png)
         content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
         content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
 *       content/browser/browser.css                   (content/browser.css)
diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp
index 261243071d7..6eb30a408d2 100644
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -102,7 +102,7 @@ static RedirEntry kRedirMap[] = {
   { "sync-tabs", "chrome://browser/content/sync/aboutSyncTabs.xul",
     nsIAboutModule::ALLOW_SCRIPT },
 #endif
-  { "home", "chrome://browser/content/abouthome/aboutHome.xhtml",
+  { "home", "chrome://browser/content/aboutHome.xhtml",
     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
     nsIAboutModule::ALLOW_SCRIPT },
   { "newtab", "chrome://browser/content/newtab/newTab.xul",
diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js
index f90234c10d0..0b6342b2bdf 100644
--- a/browser/components/nsBrowserContentHandler.js
+++ b/browser/components/nsBrowserContentHandler.js
@@ -887,7 +887,7 @@ let AboutHomeUtils = {
 
   loadSnippetsURL: function AHU_loadSnippetsURL()
   {
-    const STARTPAGE_VERSION = 2;
+    const STARTPAGE_VERSION = 1;
     let updateURL = Services.prefs
                             .getCharPref(this.SNIPPETS_URL_PREF)
                             .replace("%STARTPAGE_VERSION%", STARTPAGE_VERSION);
diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd
index 4cfa28e42bb..f41846a0d48 100644
--- a/browser/locales/en-US/chrome/browser/aboutHome.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd
@@ -1,7 +1,6 @@
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%brandDTD;
-<!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd">
-%syncBrandDTD;
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
 
 <!-- These strings are used in the about:home page -->
 
@@ -9,6 +8,8 @@
 
 <!ENTITY abouthome.searchEngineButton.label "Search">
 
+<!ENTITY abouthome.aboutMozilla "About Mozilla">
+
 <!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1):
      text in <a/> will be linked to the Firefox features page on mozilla.com
 -->
@@ -18,8 +19,5 @@
 -->
 <!ENTITY abouthome.defaultSnippet2.v1 "It's easy to customize your Firefox exactly the way you want it. <a>Choose from thousands of add-ons</a>.">
 
-<!ENTITY abouthome.bookmarksButton.label "Bookmarks">
-<!ENTITY abouthome.historyButton.label   "History">
-<!ENTITY abouthome.settingsButton.label  "Settings">
-<!ENTITY abouthome.addonsButton.label    "Add-ons">
-<!ENTITY abouthome.downloadsButton.label "Downloads">
+<!ENTITY abouthome.syncSetup.label   "Set Up Sync">
+<!ENTITY abouthome.pairDevice.label  "Pair a Device">