Index: chrome/browser/resources/downloads/manager.js |
diff --git a/chrome/browser/resources/downloads/manager.js b/chrome/browser/resources/downloads/manager.js |
index 36b2fa0a3ebef299b60d85110ddf07c0b2719a98..b0ce89ecda4cc23de33c4f314c3eca2456d60222 100644 |
--- a/chrome/browser/resources/downloads/manager.js |
+++ b/chrome/browser/resources/downloads/manager.js |
@@ -108,8 +108,10 @@ cr.define('downloads', function() { |
item.render(data); |
var focusRow = this.decorateItem_(item); |
- if (activeElement != document.activeElement) |
+ if (focusRow.contains(activeElement) && |
+ !downloads.FocusRow.shouldFocus(activeElement)) { |
focusRow.getEquivalentElement(activeElement).focus(); |
+ } |
}, |
/** |
@@ -127,8 +129,8 @@ cr.define('downloads', function() { |
var focusRow = this.decorateItem_(item); |
this.focusGrid_.addRow(focusRow); |
- if (activeElement != document.activeElement && |
- focusRow.contains(activeElement)) { |
+ if (focusRow.contains(activeElement) && |
+ !downloads.FocusRow.shouldFocus(activeElement)) { |
focusRow.getEquivalentElement(activeElement).focus(); |
} |
}, this); |