Drag and drop: Only hide the current overlay if it is the drop target

BUG=445918
R=finnur@chromium.org

Review URL: https://codereview.chromium.org/831053002

Cr-Commit-Position: refs/heads/master@{#309909}
(cherry picked from commit a8016a4e080a7531d967a1dc82574fe6e9714a8e)

Review URL: https://codereview.chromium.org/814713004

Cr-Commit-Position: refs/branch-heads/2214@{#389}
Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}

1 files changed, 12 insertions, 2 deletions

diff --git a/chrome/browser/resources/extensions/extensions.js b/chrome/browser/resources/extensions/extensions.js
index 42ad4a4..45c1caa 100644
--- a/chrome/browser/resources/extensions/extensions.js
+++ b/chrome/browser/resources/extensions/extensions.js
@@ -55,7 +55,7 @@ cr.define('extensions', function() {
     },
     /** @override */
     doDragLeave: function() {
-      ExtensionSettings.showOverlay(null);
+      this.hideDropTargetOverlay_();
       chrome.send('stopDrag');
     },
     /** @override */
@@ -64,7 +64,7 @@ cr.define('extensions', function() {
     },
     /** @override */
     doDrop: function(e) {
-      ExtensionSettings.showOverlay(null);
+      this.hideDropTargetOverlay_();
       if (e.dataTransfer.files.length != 1)
         return;
 
@@ -89,6 +89,16 @@ cr.define('extensions', function() {
         e.preventDefault();
         chrome.send(toSend);
       }
+    },
+
+    /**
+     * Hide the current overlay if it is the drop target overlay.
+     * @private
+     */
+    hideDropTargetOverlay_: function() {
+      var currentOverlay = ExtensionSettings.getCurrentOverlay();
+      if (currentOverlay && currentOverlay.id === 'drop-target-overlay')
+        ExtensionSettings.showOverlay(null);
     }
   };