| 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 a66294ba56feeb65d4b310fae1c6f2bb6fb0e08c..1de892f23ce5486e06b23ac18665b9dcaff90a5e 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| @@ -2731,17 +2731,6 @@
|
|
|
| void RenderWidgetHostViewAura::ForwardKeyboardEvent(
|
| const NativeWebKeyboardEvent& event) {
|
| - RenderWidgetHostImpl* target_host = host_;
|
| -
|
| - // If there are multiple widgets on the page (such as when there are
|
| - // out-of-process iframes), pick the one that should process this event.
|
| - if (host_->delegate()) {
|
| - RenderWidgetHostImpl* focused_host =
|
| - host_->delegate()->GetFocusedRenderWidgetHost();
|
| - if (focused_host)
|
| - target_host = focused_host;
|
| - }
|
| -
|
| #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
| ui::TextEditKeyBindingsDelegateAuraLinux* keybinding_delegate =
|
| ui::GetTextEditKeyBindingsDelegate();
|
| @@ -2757,19 +2746,16 @@
|
| edit_commands.push_back(EditCommand(it->GetCommandString(),
|
| it->argument()));
|
| }
|
| - // TODO(alexmos): This needs to be refactored to work with subframe
|
| - // RenderWidgetHosts for OOPIF. See https://crbug.com/549334.
|
| - target_host->Send(new InputMsg_SetEditCommandsForNextKeyEvent(
|
| - target_host->GetRoutingID(), edit_commands));
|
| -
|
| + host_->Send(new InputMsg_SetEditCommandsForNextKeyEvent(
|
| + host_->GetRoutingID(), edit_commands));
|
| NativeWebKeyboardEvent copy_event(event);
|
| copy_event.match_edit_command = true;
|
| - target_host->ForwardKeyboardEvent(event);
|
| - return;
|
| - }
|
| -#endif
|
| -
|
| - target_host->ForwardKeyboardEvent(event);
|
| + host_->ForwardKeyboardEvent(copy_event);
|
| + return;
|
| + }
|
| +#endif
|
| +
|
| + host_->ForwardKeyboardEvent(event);
|
| }
|
|
|
| void RenderWidgetHostViewAura::SelectionUpdated(bool is_editable,
|
|
|