Bug 1207422 - Remove Apps link from about:home. r=gijs

Brli · Jan 6, 2016 · b336cf3 · b336cf3
1 parent 969cdb4
commit b336cf3
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 24 deletions.
diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css
@@ -311,10 +311,6 @@ body[narrow] #restorePreviousSession {
   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");
 }
@@ -415,10 +411,6 @@ body[narrow] #restorePreviousSession::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");
   }

diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml
@@ -63,7 +63,6 @@
       <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

diff --git a/browser/base/content/abouthome/apps.png b/browser/base/content/abouthome/apps.png
diff --git a/browser/base/content/abouthome/apps@2x.png b/browser/base/content/abouthome/apps@2x.png
diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js
@@ -195,10 +195,6 @@ var AboutHomeListener = {
         sendAsyncMessage("AboutHome:History");
         break;
 
-      case "apps":
-        sendAsyncMessage("AboutHome:Apps");
-        break;
-
       case "addons":
         sendAsyncMessage("AboutHome:Addons");
         break;

diff --git a/browser/base/jar.mn b/browser/base/jar.mn
@@ -27,7 +27,6 @@ browser.jar:
         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)
@@ -39,7 +38,6 @@ browser.jar:
         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)

diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd
@@ -31,9 +31,5 @@
      preferences/options item on about:home on Linux and OS X -->
 <!ENTITY abouthome.preferencesButtonUnix.label  "Preferences">
 <!ENTITY abouthome.addonsButton.label    "Add-ons">
-<!-- LOCALIZATION NOTE (abouthome.appsButton2.label): This string should be consistent with
-     the Apps menu item in the Tools menu (webapps.label in browser.dtd) and the Apps toolbar button in
-     Firefox's customization palette (web-apps-button.label in customizableWidgets.properties) -->
-<!ENTITY abouthome.appsButton2.label     "Apps">
 <!ENTITY abouthome.downloadsButton.label "Downloads">
 <!ENTITY abouthome.syncButton.label      "&syncBrand.shortName.label;">
diff --git a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm
@@ -95,7 +95,6 @@ var AboutHome = {
     "AboutHome:Downloads",
     "AboutHome:Bookmarks",
     "AboutHome:History",
-    "AboutHome:Apps",
     "AboutHome:Addons",
     "AboutHome:Sync",
     "AboutHome:Settings",
@@ -134,10 +133,6 @@ var AboutHome = {
         window.PlacesCommandHook.showPlacesOrganizer("History");
         break;
 
-      case "AboutHome:Apps":
-        window.BrowserOpenApps();
-        break;
-
       case "AboutHome:Addons":
         window.BrowserOpenAddonsMgr();
         break;