Bug 1207422 - Remove Apps link from about:home. r=gijs a=ritu
authorDão Gottwald <dao@mozilla.com>
Sat, 09 Jan 2016 10:14:39 +0100
changeset 292510 7734ce11e073f91e2bdded07f0dde58c878b1d9d
parent 292500 098464f40ee921e2a4be9d42e528351619a806ab
child 292511 4791761ef641fb9b94f11b5c658226db4220e946
push id254
push usercbook@mozilla.com
push dateWed, 13 Jan 2016 11:04:22 +0000
reviewersgijs, ritu
bugs1207422
milestone44.0
Bug 1207422 - Remove Apps link from about:home. r=gijs a=ritu
browser/base/content/abouthome/aboutHome.css
browser/base/content/abouthome/aboutHome.xhtml
browser/base/content/abouthome/apps.png
browser/base/content/abouthome/apps@2x.png
browser/base/content/tab-content.js
browser/base/jar.mn
browser/modules/AboutHome.jsm
--- a/browser/base/content/abouthome/aboutHome.css
+++ b/browser/base/content/abouthome/aboutHome.css
@@ -306,20 +306,16 @@ body[narrow] #restorePreviousSession {
 #bookmarks::before {
   content: url("chrome://browser/content/abouthome/bookmarks.png");
 }
 
 #history::before {
   content: url("chrome://browser/content/abouthome/history.png");
 }
 
-#apps::before {
-  content: url("chrome://browser/content/abouthome/apps.png");
-}
-
 #addons::before {
   content: url("chrome://browser/content/abouthome/addons.png");
 }
 
 #sync::before {
   content: url("chrome://browser/content/abouthome/sync.png");
 }
 
@@ -410,20 +406,16 @@ body[narrow] #restorePreviousSession::be
   #bookmarks::before {
     content: url("chrome://browser/content/abouthome/bookmarks@2x.png");
   }
 
   #history::before {
     content: url("chrome://browser/content/abouthome/history@2x.png");
   }
 
-  #apps::before {
-    content: url("chrome://browser/content/abouthome/apps@2x.png");
-  }
-
   #addons::before {
     content: url("chrome://browser/content/abouthome/addons@2x.png");
   }
 
   #sync::before {
     content: url("chrome://browser/content/abouthome/sync@2x.png");
   }
 
--- a/browser/base/content/abouthome/aboutHome.xhtml
+++ b/browser/base/content/abouthome/aboutHome.xhtml
@@ -58,17 +58,16 @@
       </div>
     </div>
     <div class="spacer"/>
 
     <div id="launcher">
       <button class="launchButton" id="downloads">&abouthome.downloadsButton.label;</button>
       <button class="launchButton" id="bookmarks">&abouthome.bookmarksButton.label;</button>
       <button class="launchButton" id="history">&abouthome.historyButton.label;</button>
-      <button class="launchButton" id="apps">&abouthome.appsButton2.label;</button>
       <button class="launchButton" id="addons">&abouthome.addonsButton.label;</button>
       <button class="launchButton" id="sync">&abouthome.syncButton.label;</button>
 #ifdef XP_WIN
       <button class="launchButton" id="settings">&abouthome.preferencesButtonWin.label;</button>
 #else
       <button class="launchButton" id="settings">&abouthome.preferencesButtonUnix.label;</button>
 #endif
       <div id="restorePreviousSessionSeparator"/>
deleted file mode 100644
index 79fc95d49ff1c848c71a2686885ecdf758a9a32d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index cbe7a6d5364a3bd173d1c680981777e30f84c16e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/base/content/tab-content.js
+++ b/browser/base/content/tab-content.js
@@ -190,20 +190,16 @@ var AboutHomeListener = {
       case "bookmarks":
         sendAsyncMessage("AboutHome:Bookmarks");
         break;
 
       case "history":
         sendAsyncMessage("AboutHome:History");
         break;
 
-      case "apps":
-        sendAsyncMessage("AboutHome:Apps");
-        break;
-
       case "addons":
         sendAsyncMessage("AboutHome:Addons");
         break;
 
       case "sync":
         sendAsyncMessage("AboutHome:Sync");
         break;
 
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -21,29 +21,27 @@ browser.jar:
 *       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/downloads.png       (content/abouthome/downloads.png)
         content/browser/abouthome/bookmarks.png       (content/abouthome/bookmarks.png)
         content/browser/abouthome/history.png         (content/abouthome/history.png)
-        content/browser/abouthome/apps.png            (content/abouthome/apps.png)
         content/browser/abouthome/addons.png          (content/abouthome/addons.png)
         content/browser/abouthome/sync.png            (content/abouthome/sync.png)
         content/browser/abouthome/settings.png        (content/abouthome/settings.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/snippet1@2x.png      (content/abouthome/snippet1@2x.png)
         content/browser/abouthome/snippet2@2x.png      (content/abouthome/snippet2@2x.png)
         content/browser/abouthome/downloads@2x.png     (content/abouthome/downloads@2x.png)
         content/browser/abouthome/bookmarks@2x.png     (content/abouthome/bookmarks@2x.png)
         content/browser/abouthome/history@2x.png       (content/abouthome/history@2x.png)
-        content/browser/abouthome/apps@2x.png          (content/abouthome/apps@2x.png)
         content/browser/abouthome/addons@2x.png        (content/abouthome/addons@2x.png)
         content/browser/abouthome/sync@2x.png          (content/abouthome/sync@2x.png)
         content/browser/abouthome/settings@2x.png      (content/abouthome/settings@2x.png)
         content/browser/abouthome/restore@2x.png       (content/abouthome/restore@2x.png)
         content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png)
         content/browser/abouthome/mozilla@2x.png       (content/abouthome/mozilla@2x.png)
 
         content/browser/aboutNetError.xhtml            (content/aboutNetError.xhtml)
--- a/browser/modules/AboutHome.jsm
+++ b/browser/modules/AboutHome.jsm
@@ -90,17 +90,16 @@ XPCOMUtils.defineLazyGetter(AboutHomeUti
  * message that's handled here.
  */
 var AboutHome = {
   MESSAGES: [
     "AboutHome:RestorePreviousSession",
     "AboutHome:Downloads",
     "AboutHome:Bookmarks",
     "AboutHome:History",
-    "AboutHome:Apps",
     "AboutHome:Addons",
     "AboutHome:Sync",
     "AboutHome:Settings",
     "AboutHome:RequestUpdate",
   ],
 
   init: function() {
     let mm = Cc["@mozilla.org/globalmessagemanager;1"].getService(Ci.nsIMessageListenerManager);
@@ -129,20 +128,16 @@ var AboutHome = {
       case "AboutHome:Bookmarks":
         window.PlacesCommandHook.showPlacesOrganizer("AllBookmarks");
         break;
 
       case "AboutHome:History":
         window.PlacesCommandHook.showPlacesOrganizer("History");
         break;
 
-      case "AboutHome:Apps":
-        window.BrowserOpenApps();
-        break;
-
       case "AboutHome:Addons":
         window.BrowserOpenAddonsMgr();
         break;
 
       case "AboutHome:Sync":
         window.openPreferences("paneSync", { urlParams: { entrypoint: "abouthome" } });
         break;