| 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 8db3faeab6baa94290b84757401ad7112abd5a4d..9fb1247429576dbfac898cf80ff38a038541c1c6 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| @@ -536,8 +536,6 @@ void RenderWidgetHostViewAura::InitAsPopup(
|
|
|
| SetBounds(bounds_in_screen);
|
| Show();
|
| - if (NeedsMouseCapture())
|
| - window_->SetCapture();
|
|
|
| event_filter_for_popup_exit_.reset(new EventFilterForPopupExit(this));
|
| }
|
| @@ -1448,11 +1446,6 @@ void RenderWidgetHostViewAura::InsertText(const base::string16& text) {
|
| }
|
|
|
| void RenderWidgetHostViewAura::InsertChar(base::char16 ch, int flags) {
|
| - if (popup_child_host_view_ && popup_child_host_view_->NeedsInputGrab()) {
|
| - popup_child_host_view_->InsertChar(ch, flags);
|
| - return;
|
| - }
|
| -
|
| // Ignore character messages for VKEY_RETURN sent on CTRL+M. crbug.com/315547
|
| if (host_ && (accept_return_character_ || ch != ui::VKEY_RETURN)) {
|
| double now = ui::EventTimeForNow().InSecondsF();
|
| @@ -1802,12 +1795,6 @@ void RenderWidgetHostViewAura::OnKeyEvent(ui::KeyEvent* event) {
|
| if (touch_editing_client_ && touch_editing_client_->HandleInputEvent(event))
|
| return;
|
|
|
| - if (popup_child_host_view_ && popup_child_host_view_->NeedsInputGrab()) {
|
| - popup_child_host_view_->OnKeyEvent(event);
|
| - if (event->handled())
|
| - return;
|
| - }
|
| -
|
| // We need to handle the Escape key for Pepper Flash.
|
| if (is_fullscreen_ && event->key_code() == ui::VKEY_ESCAPE) {
|
| // Focus the window we were created from.
|
| @@ -1973,8 +1960,7 @@ void RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) {
|
| window_->SetCapture();
|
| break;
|
| case ui::ET_MOUSE_RELEASED:
|
| - if (!NeedsMouseCapture())
|
| - window_->ReleaseCapture();
|
| + window_->ReleaseCapture();
|
| break;
|
| default:
|
| break;
|
| @@ -2315,17 +2301,6 @@ void RenderWidgetHostViewAura::Shutdown() {
|
| }
|
| }
|
|
|
| -bool RenderWidgetHostViewAura::NeedsInputGrab() {
|
| - return popup_type_ == blink::WebPopupTypeSelect;
|
| -}
|
| -
|
| -bool RenderWidgetHostViewAura::NeedsMouseCapture() {
|
| -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
| - return NeedsInputGrab();
|
| -#endif
|
| - return false;
|
| -}
|
| -
|
| void RenderWidgetHostViewAura::FinishImeCompositionSession() {
|
| if (!has_composition_text_)
|
| return;
|
|
|