Commit dfce0f31 authored by mboc's avatar mboc Committed by Commit bot

Aura: Don't activate menus and other non-activatable widgets on drop

BUG=none

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

Cr-Commit-Position: refs/heads/master@{#292848}
parent 6626c4c1
...@@ -1140,7 +1140,8 @@ void DesktopNativeWidgetAura::OnDragExited() { ...@@ -1140,7 +1140,8 @@ void DesktopNativeWidgetAura::OnDragExited() {
int DesktopNativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) { int DesktopNativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) {
DCHECK(drop_helper_.get() != NULL); DCHECK(drop_helper_.get() != NULL);
Activate(); if (ShouldActivate())
Activate();
return drop_helper_->OnDrop(event.data(), event.location(), return drop_helper_->OnDrop(event.data(), event.location(),
last_drop_operation_); last_drop_operation_);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment