backout merge

browser/base/content/browser-context.inc

@@ -77,10 +77,6 @@
                 label="&copyLinkCmd.label;"
                 accesskey="&copyLinkCmd.accesskey;"
                 oncommand="goDoCommand('cmd_copyLink');"/>
-      <menuitem id="context-copylinktext"
-                label="&copyLinkText2Cmd.label;"
-                accesskey="&copyLinkText2Cmd.accesskey;"
-                oncommand="gContextMenu.copyLinkText();"/>
       <menuseparator id="context-sep-copylink"/>
       <menuitem id="context-media-play"
                 label="&mediaPlay.label;"

browser/base/content/nsContextMenu.js

@@ -438,8 +438,6 @@ nsContextMenu.prototype = {
 
     // Copy link location depends on whether we're on a non-mailto link.
     this.showItem("context-copylink", this.onLink && !this.onMailtoLink);
-    this.showItem("context-copylinktext",
-                  this.onLink && !this.onImage && !this.isTextSelected);
     this.showItem("context-sep-copylink", this.onLink &&
                   (this.onImage || this.onVideo || this.onAudio));
 
@@ -1180,14 +1178,6 @@ nsContextMenu.prototype = {
     clipboard.copyString(addresses);
   },
 
-  copyLinkText: function() {
-    let text = this.linkText();
-
-    let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].
-                    getService(Ci.nsIClipboardHelper);
-    clipboard.copyString(text);
-  },
-
   ///////////////
   // Utilities //
   ///////////////

browser/base/content/test/test_contextmenu.html

@@ -173,16 +173,14 @@ function runTest(testNum) {
                           "context-bookmarklink",  true,
                           "context-savelink",      true,
                           "context-sendlink",      true,
-                          "context-copylink",      true,
-                          "context-copylinktext",  true]);
+                          "context-copylink",      true]);
         closeContextMenu();
         openContextMenuFor(mailto); // Invoke context menu for next test.
         break;
 
     case 4:
         // Context menu for text mailto-link
-        checkContextMenu(["context-copyemail",    true,
-                          "context-copylinktext", true]);
+        checkContextMenu(["context-copyemail", true]);
         closeContextMenu();
         openContextMenuFor(input); // Invoke context menu for next test.
         break;

browser/locales/en-US/chrome/browser/browser.dtd

@@ -308,8 +308,6 @@
 <!ENTITY sendAudioCmd.accesskey       "n">
 <!ENTITY copyLinkCmd.label            "Copy Link Location">
 <!ENTITY copyLinkCmd.accesskey        "a">
-<!ENTITY copyLinkText2Cmd.label       "Copy Link Text">
-<!ENTITY copyLinkText2Cmd.accesskey   "x">
 <!ENTITY copyImageCmd.label           "Copy Image Location">
 <!ENTITY copyImageCmd.accesskey       "o">
 <!ENTITY copyImageContentsCmd.label   "Copy Image">