Chromium Code Reviews| 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 1785386da2064328515ecd06d15f5b46bffc6423..e5049457464bce1805cf51282499f963a259c158 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,16 @@ 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()) |
| + |
| + DCHECK(event); |
|
Ben Goodger (Google)
2013/04/18 17:04:51
I think you shouldn't need this. We make the assum
sschmitz
2013/04/18 17:21:43
Done.
|
| + 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(); |
| } |