Bug 1226238 - (Part 1) Remove share button from reader view. r=ahunt,Gijs

MozReview-Commit-ID: 3TFzz809KcM

browser/modules/ReaderParent.jsm

@@ -28,7 +28,6 @@ var ReaderParent = {
     "Reader:FaviconRequest",
     "Reader:ListStatusRequest",
     "Reader:RemoveFromList",
-    "Reader:Share",
     "Reader:SystemUIVisibility",
     "Reader:UpdateReaderButton",
     "Reader:SetIntPref",
@@ -72,9 +71,6 @@ var ReaderParent = {
         }
         break;
       }
-      case "Reader:Share":
-        // XXX: To implement.
-        break;
 
       case "Reader:SystemUIVisibility":
         // XXX: To implement.

mobile/android/base/java/org/mozilla/gecko/BrowserApp.java

@@ -696,7 +696,6 @@ public class BrowserApp extends GeckoApp
             "Feedback:OpenPlayStore",
             "Menu:Add",
             "Menu:Remove",
-            "Reader:Share",
             "Sanitize:ClearHistory",
             "Sanitize:ClearSyncedTabs",
             "Settings:Show",
@@ -1408,7 +1407,6 @@ public class BrowserApp extends GeckoApp
             "Feedback:OpenPlayStore",
             "Menu:Add",
             "Menu:Remove",
-            "Reader:Share",
             "Sanitize:ClearHistory",
             "Sanitize:ClearSyncedTabs",
             "Settings:Show",
@@ -1729,11 +1727,6 @@ public class BrowserApp extends GeckoApp
                     removeAddonMenuItem(id);
                 }
             });
-
-        } else if ("Reader:Share".equals(event)) {
-            final String title = message.getString("title");
-            final String url = message.getString("url");
-            GeckoAppShell.openUriExternal(url, "text/plain", "", "", Intent.ACTION_SEND, title, false);
         } else if ("Sanitize:ClearHistory".equals(event)) {
             handleClearHistory(message.optBoolean("clearSearchHistory", false));
             callback.sendSuccess(true);

mobile/android/chrome/content/Reader.js

@@ -163,14 +163,6 @@ var Reader = {
         });
         break;
 
-      case "Reader:Share":
-        Messaging.sendRequest({
-          type: "Reader:Share",
-          url: message.data.url,
-          title: message.data.title
-        });
-        break;
-
       case "Reader:SystemUIVisibility":
         Messaging.sendRequest({
           type: "SystemUI:Visibility",

mobile/android/chrome/content/browser.js

@@ -198,7 +198,6 @@ lazilyLoadedObserverScripts.forEach(function (aScript) {
     ["Reader:FaviconRequest", false],
     ["Reader:ListStatusRequest", false],
     ["Reader:RemoveFromList", false],
-    ["Reader:Share", false],
     ["Reader:ToolbarHidden", false],
     ["Reader:SystemUIVisibility", false],
     ["Reader:UpdateReaderButton", false],

mobile/android/themes/core/aboutReaderControls.css

@@ -254,10 +254,6 @@
   background-image: url('chrome://browser/skin/images/reader-toggle-off-icon-mdpi.png');
 }
 
-.share-button {
-  background-image: url('chrome://browser/skin/images/reader-share-icon-mdpi.png');
-}
-
 .style-button {
   background-image: url('chrome://browser/skin/images/reader-style-icon-mdpi.png');
 }
@@ -283,10 +279,6 @@
     background-image: url('chrome://browser/skin/images/reader-toggle-off-icon-hdpi.png');
   }
 
-  .share-button {
-    background-image: url('chrome://browser/skin/images/reader-share-icon-hdpi.png');
-  }
-
   .style-button {
     background-image: url('chrome://browser/skin/images/reader-style-icon-hdpi.png');
   }
@@ -313,10 +305,6 @@
     background-image: url('chrome://browser/skin/images/reader-toggle-off-icon-xhdpi.png');
   }
 
-  .share-button {
-    background-image: url('chrome://browser/skin/images/reader-share-icon-xhdpi.png');
-  }
-
   .style-button {
     background-image: url('chrome://browser/skin/images/reader-style-icon-xhdpi.png');
   }
@@ -343,10 +331,6 @@
     background-image: url('chrome://browser/skin/images/reader-toggle-off-icon-xxhdpi.png');
   }
 
-  .share-button {
-    background-image: url('chrome://browser/skin/images/reader-share-icon-xhdpi.png');
-  }
-
   .style-button {
     background-image: url('chrome://browser/skin/images/reader-style-icon-xxhdpi.png');
   }

mobile/android/themes/core/jar.mn

@@ -106,10 +106,6 @@ chrome.jar:
   skin/images/reader-toggle-off-icon-hdpi.png    (images/reader-toggle-off-icon-hdpi.png)
   skin/images/reader-toggle-off-icon-xhdpi.png   (images/reader-toggle-off-icon-xhdpi.png)
   skin/images/reader-toggle-off-icon-xxhdpi.png  (images/reader-toggle-off-icon-xxhdpi.png)
-  skin/images/reader-share-icon-mdpi.png         (images/reader-share-icon-mdpi.png)
-  skin/images/reader-share-icon-hdpi.png         (images/reader-share-icon-hdpi.png)
-  skin/images/reader-share-icon-xhdpi.png        (images/reader-share-icon-xhdpi.png)
-  skin/images/reader-share-icon-xxhdpi.png       (images/reader-share-icon-xxhdpi.png)
   skin/images/reader-style-icon-active-mdpi.png  (images/reader-style-icon-active-mdpi.png)
   skin/images/reader-style-icon-active-hdpi.png  (images/reader-style-icon-active-hdpi.png)
   skin/images/reader-style-icon-active-xhdpi.png (images/reader-style-icon-active-xhdpi.png)

toolkit/components/reader/AboutReader.jsm

@@ -71,7 +71,6 @@ var AboutReader = function(mm, win, articlePromise) {
 
   this._setupStyleDropdown();
   this._setupButton("close-button", this._onReaderClose.bind(this), "aboutReader.toolbar.close");
-  this._setupButton("share-button", this._onShare.bind(this), "aboutReader.toolbar.share");
 
   try {
     if (Services.prefs.getBoolPref("browser.readinglist.enabled")) {
@@ -363,17 +362,6 @@ AboutReader.prototype = {
     }
   },
 
-  _onShare: function() {
-    if (!this._article)
-      return;
-
-    this._mm.sendAsyncMessage("Reader:Share", {
-      url: this._article.url,
-      title: this._article.title
-    });
-    UITelemetry.addEvent("share.1", "list", null, "reader");
-  },
-
   /**
    * To help introduce ReadingList, we want to automatically
    * open the Desktop sidebar the first time ReaderMode is used.

toolkit/components/reader/content/aboutReader.html

@@ -49,7 +49,6 @@
       @import url("chrome://global/skin/aboutReaderControls.css");
     </style>
     <li><button id="close-button" class="button close-button"/></li>
-    <li><button id="share-button" class="button share-button"/></li>
     <ul id="style-dropdown" class="dropdown">
       <li><button class="dropdown-toggle button style-button"/></li>
       <li id="reader-popup" class="dropdown-popup">

toolkit/locales/en-US/chrome/global/aboutReader.properties

@@ -27,7 +27,6 @@ aboutReader.toolbar.addToReadingList=Add to Reading List
 aboutReader.toolbar.removeFromReadingList=Remove from Reading List
 aboutReader.toolbar.openReadingList=Open Reading List
 aboutReader.toolbar.closeReadingList=Close Reading List
-aboutReader.toolbar.share=Share
 
 aboutReader.footer.deleteThisArticle=Delete this article
 

toolkit/themes/shared/aboutReaderControls.css

@@ -327,11 +327,6 @@
 
 /*======= Toolbar icons =======*/
 
-/* Android-only controls */
-.share-button {
-  display: none;
-}
-
 .close-button {
   background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg#close");
   height: 68px;