Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1008)

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 11829044: Revert 175644 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
===================================================================
--- content/browser/renderer_host/render_widget_host_view_aura.cc (revision 175949)
+++ content/browser/renderer_host/render_widget_host_view_aura.cc (working copy)
@@ -342,8 +342,6 @@
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");
@@ -1551,10 +1549,7 @@
FinishImeCompositionSession();
break;
case ui::ET_MOUSE_RELEASED:
- if (popup_type_ == WebKit::WebPopupTypeNone &&
- (popup_child_host_view_ == NULL ||
- popup_child_host_view_->popup_type_ == WebKit::WebPopupTypeNone))
- window_->ReleaseCapture();
+ window_->ReleaseCapture();
break;
default:
break;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698