remove social api left overs

3 files changed, 3 insertions, 36 deletions

diff --git a/base/content/browser.css b/base/content/browser.css
index f03f21c..ac5bf9e 100644
--- a/base/content/browser.css
+++ b/base/content/browser.css
@@ -933,11 +933,6 @@ html|*#gcli-output-frame,
   transition: none;
 }
 
-panelview > .social-panel-frame {
-  width: auto;
-  height: auto;
-}
-
 /* Translation */
 notification[value="translation"] {
   -moz-binding: url("chrome://browser/content/translation-infobar.xml#translationbar");
diff --git a/base/content/content.js b/base/content/content.js
index 496e0d1..5758cb0 100644
--- a/base/content/content.js
+++ b/base/content/content.js
@@ -698,37 +698,6 @@ var PageMetadataMessenger = {
 }
 PageMetadataMessenger.init();
 
-addEventListener("ActivateSocialFeature", function (aEvent) {
-  let document = content.document;
-  let dwu = content.QueryInterface(Ci.nsIInterfaceRequestor)
-                   .getInterface(Ci.nsIDOMWindowUtils);
-  if (!dwu.isHandlingUserInput) {
-    Cu.reportError("attempt to activate provider without user input from " + document.nodePrincipal.origin);
-    return;
-  }
-
-  let node = aEvent.target;
-  let ownerDocument = node.ownerDocument;
-  let data = node.getAttribute("data-service");
-  if (data) {
-    try {
-      data = JSON.parse(data);
-    } catch (e) {
-      Cu.reportError("Social Service manifest parse error: " + e);
-      return;
-    }
-  } else {
-    Cu.reportError("Social Service manifest not available");
-    return;
-  }
-
-  sendAsyncMessage("Social:Activation", {
-    url: ownerDocument.location.href,
-    origin: ownerDocument.nodePrincipal.origin,
-    manifest: data
-  });
-}, true, true);
-
 addMessageListener("ContextMenu:SaveVideoFrameAsImage", (message) => {
   let video = message.objects.target;
   let canvas = content.document.createElementNS("http://www.w3.org/1999/xhtml", "canvas");
diff --git a/base/content/nsContextMenu.js b/base/content/nsContextMenu.js
index ecd00f9..e3ffa79 100644
--- a/base/content/nsContextMenu.js
+++ b/base/content/nsContextMenu.js
@@ -181,6 +181,9 @@ nsContextMenu.prototype = {
     let stopped = XULBrowserWindow.stopCommand.getAttribute("disabled") == "true";
 
     let stopReloadItem = "";
+    if (shouldShow) {
+        stopReloadItem = (stopped) ? "reload" : "stop";
+    }
 
     this.showItem("context-reload", stopReloadItem == "reload");
     this.showItem("context-stop", stopReloadItem == "stop");