From 75e0003c9e4a233ad860fc5eb1922d7b55e98fc4 Mon Sep 17 00:00:00 2001
From: Neil Deakin <neil@mozilla.com>
Date: Fri, 19 Sep 2008 11:26:37 -0400
Subject: [PATCH] Bug 410569, tabbrowser should be using drag action rather
 than checking the keyboard state itself, r=mano

---
 browser/base/content/tabbrowser.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index f6efd1c1f546..aeec2a2525a5 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -1918,20 +1918,16 @@
         <parameter name="aDragSession"/>
         <body>
           <![CDATA[
-#ifndef XP_MACOSX
-            var accelKeyPressed = aEvent.ctrlKey;
-#else
-            var accelKeyPressed = aEvent.metaKey;
-#endif
+            var isCopy = aEvent.dataTransfer.dropEffect == "copy";
             var draggedTab;
             if (aDragSession.sourceNode && aDragSession.sourceNode.localName == "tab" &&
                 (aDragSession.sourceNode.parentNode == this.mTabContainer ||
                  aDragSession.sourceNode.ownerDocument.defaultView instanceof ChromeWindow &&
                  aDragSession.sourceNode.ownerDocument.documentElement.getAttribute("windowtype") == "navigator:browser"))
               draggedTab = aDragSession.sourceNode;
-            if (draggedTab && (accelKeyPressed || draggedTab.parentNode == this.mTabContainer)) {
+            if (draggedTab && (isCopy || draggedTab.parentNode == this.mTabContainer)) {
               var newIndex = this.getNewIndex(aEvent);
-              if (accelKeyPressed) {
+              if (isCopy) {
                 // copy the dropped tab (wherever it's from)
                 var newTab = this.duplicateTab(draggedTab);
                 this.moveTabTo(newTab, newIndex);
@@ -1988,7 +1984,7 @@
               if (aEvent.shiftKey)
                 bgLoad = !bgLoad;
 
-              if (document.getBindingParent(aEvent.originalTarget).localName != "tab" || accelKeyPressed) {
+              if (document.getBindingParent(aEvent.originalTarget).localName != "tab" || isCopy) {
                 // We're adding a new tab.
                 newIndex = this.getNewIndex(aEvent);
                 newTab = this.loadOneTab(getShortcutOrURI(url), null, null, null, bgLoad, false);
