| Index: content/browser/renderer_host/render_widget_host_view_aura.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| index fd3f2a3b50780bbfd46cbb66b14593b9b795a106..cf0010a0c43fd8c53c731d55a88d764d78f32d7f 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| @@ -399,18 +399,15 @@ class RenderWidgetHostViewAura::EventFilterForPopupExit :
|
|
|
| void RenderWidgetHostViewAura::ApplyEventFilterForPopupExit(
|
| ui::MouseEvent* event) {
|
| - if (in_shutdown_) {
|
| - event_filter_for_popup_exit_.reset();
|
| + if (in_shutdown_ || is_fullscreen_)
|
| return;
|
| - }
|
| - if (is_fullscreen_ || event->type() != ui::ET_MOUSE_PRESSED ||
|
| - !event->target())
|
| +
|
| + if (event->type() != ui::ET_MOUSE_PRESSED || !event->target())
|
| return;
|
|
|
| DCHECK(popup_parent_host_view_);
|
| aura::Window* target = static_cast<aura::Window*>(event->target());
|
| if (target != window_ && target != popup_parent_host_view_->window_) {
|
| - event_filter_for_popup_exit_.reset();
|
| in_shutdown_ = true;
|
| host_->Shutdown();
|
| }
|
|
|