| Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| index f4875b13eb2db2d5b64a2b23bed7c01173917e29..1a658b1bf4207281241ddf81b17c773d319694cb 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| @@ -1140,7 +1140,8 @@ void DesktopNativeWidgetAura::OnDragExited() {
|
|
|
| int DesktopNativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) {
|
| DCHECK(drop_helper_.get() != NULL);
|
| - Activate();
|
| + if (ShouldActivate())
|
| + Activate();
|
| return drop_helper_->OnDrop(event.data(), event.location(),
|
| last_drop_operation_);
|
| }
|
|
|