Backed out changeset 244076fc9a47 due to wrong commit message. DONTBUILD

browser/base/content/aboutHome.css

@@ -254,26 +254,6 @@ body[dir=rtl] #searchSubmit:active {
               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;

browser/base/content/aboutHome.js

@@ -141,8 +141,8 @@ const SEARCH_ENGINES = {
 //   * add an entry here in the proper ordering (based on spans)
 // The <a/> part of the snippet will be linked to the corresponding url.
 const DEFAULT_SNIPPETS_URLS = [
-  "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1"
-, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2"
+  "http://www.mozilla.com/firefox/4.0/features"
+, "https://addons.mozilla.org/firefox/?src=snippet"
 ];
 
 const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.

browser/base/content/aboutHome.xhtml

@@ -87,8 +87,8 @@
     <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>
+          <span>&abouthome.defaultSnippet1.v1;</span>
+          <span>&abouthome.defaultSnippet2.v1;</span>
         </div>
         <div id="snippets"/>
       </div>

browser/base/jar.mn

@@ -21,8 +21,6 @@ browser.jar:
 *       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)