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 49ef41bdbf3c2fd5507f79ae94ec132b5bd4c33c..a964ea481da19667d4f312ad43be4c835c08032a 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc |
| @@ -341,6 +341,8 @@ void RenderWidgetHostViewAura::InitAsPopup( |
| old_child->popup_parent_host_view_ = NULL; |
| } |
| popup_parent_host_view_->popup_child_host_view_ = this; |
| + if (popup_type_ != WebKit::WebPopupTypeNone) |
| + window_->SetCapture(); |
| window_->SetType(aura::client::WINDOW_TYPE_MENU); |
| window_->Init(ui::LAYER_TEXTURED); |
| window_->SetName("RenderWidgetHostViewAura"); |
| @@ -1544,7 +1546,10 @@ void RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) { |
| FinishImeCompositionSession(); |
| break; |
| case ui::ET_MOUSE_RELEASED: |
| - window_->ReleaseCapture(); |
| + if (popup_type_ == WebKit::WebPopupTypeNone && |
| + (popup_child_host_view_ == NULL || |
|
Ben Goodger (Google)
2013/01/08 20:48:20
!popup_child_host_view_
|
| + popup_child_host_view_->popup_type_ == WebKit::WebPopupTypeNone)) |
| + window_->ReleaseCapture(); |
| break; |
| default: |
| break; |