mozilla-inbound: changeset 235320:61da841bfb68af3b5d1f47afa6ae0cfb688af4cc

author	Wes Kocher <wkocher@mozilla.com>
	Mon, 23 Mar 2015 18:08:29 -0700
changeset 235320	61da841bfb68af3b5d1f47afa6ae0cfb688af4cc
parent 235319	d1e8f7d585ddb44f46227b90d7a16ab1b8b6f687 (current diff)
parent 235307	840cfd5bc9712a9dbccb829b71abc5fdcfd00020 (diff)
child 235321	9eeae9660e619dca2f1dd6f4579a90ac3aa97bf0
push id	57400
push user	ryanvm@gmail.com
push date	Tue, 24 Mar 2015 15:59:13 +0000
treeherder	mozilla-inbound@47fa87252df0 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	merge
milestone	39.0a1
first release with	nightly linux32 cc0950b7a369 / 39.0a1 / 20150325030206 / files nightly linux64 cc0950b7a369 / 39.0a1 / 20150325030206 / files nightly mac cc0950b7a369 / 39.0a1 / 20150325030206 / files nightly win32 cc0950b7a369 / 39.0a1 / 20150325030206 / files nightly win64 cc0950b7a369 / 39.0a1 / 20150325030206 / files
last release without	nightly linux32 840cfd5bc971 / 39.0a1 / 20150324030207 / files nightly linux64 840cfd5bc971 / 39.0a1 / 20150324030207 / files nightly mac 840cfd5bc971 / 39.0a1 / 20150324030207 / files nightly win32 840cfd5bc971 / 39.0a1 / 20150324030207 / files nightly win64 840cfd5bc971 / 39.0a1 / 20150324030207 / files

--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -4393,17 +4393,17 @@
               if (PrivateBrowsingUtils.isWindowPrivate(window) !=
                   PrivateBrowsingUtils.isWindowPrivate(sourceNode.ownerDocument.defaultView))
                 return dt.effectAllowed = "none";
 
               if (window.gMultiProcessBrowser !=
                   sourceNode.ownerDocument.defaultView.gMultiProcessBrowser)
                 return dt.effectAllowed = "none";
 
-              let copyModifier = this.AppConstants.platform == "macosx" ? event.altKey : event.ctrlKey;
+              let copyModifier = this.tabbrowser.AppConstants.platform == "macosx" ? event.altKey : event.ctrlKey;
               return dt.effectAllowed = copyModifier ? "copy" : "move";
             }
           }
 
           if (browserDragAndDrop.canDropLink(event)) {
             // Here we need to do this manually
             return dt.effectAllowed = dt.dropEffect = "link";
           }