| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 2215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2226 event.os_event && | 2226 event.os_event && |
| 2227 keybinding_delegate->MatchEvent(*event.os_event, &commands)) { | 2227 keybinding_delegate->MatchEvent(*event.os_event, &commands)) { |
| 2228 // Transform from ui/ types to content/ types. | 2228 // Transform from ui/ types to content/ types. |
| 2229 EditCommands edit_commands; | 2229 EditCommands edit_commands; |
| 2230 for (std::vector<ui::TextEditCommandAuraLinux>::const_iterator it = | 2230 for (std::vector<ui::TextEditCommandAuraLinux>::const_iterator it = |
| 2231 commands.begin(); it != commands.end(); ++it) { | 2231 commands.begin(); it != commands.end(); ++it) { |
| 2232 edit_commands.push_back(EditCommand(it->GetCommandString(), | 2232 edit_commands.push_back(EditCommand(it->GetCommandString(), |
| 2233 it->argument())); | 2233 it->argument())); |
| 2234 } | 2234 } |
| 2235 | 2235 |
| 2236 target_host->Send(new InputMsg_SetEditCommandsForNextKeyEvent( | 2236 target_host->ForwardKeyboardEventWithCommands(event, &edit_commands); |
| 2237 target_host->GetRoutingID(), edit_commands)); | |
| 2238 target_host->ForwardKeyboardEvent(event); | |
| 2239 return; | 2237 return; |
| 2240 } | 2238 } |
| 2241 #endif | 2239 #endif |
| 2242 | 2240 |
| 2243 target_host->ForwardKeyboardEvent(event); | 2241 target_host->ForwardKeyboardEvent(event); |
| 2244 } | 2242 } |
| 2245 | 2243 |
| 2246 void RenderWidgetHostViewAura::CreateSelectionController() { | 2244 void RenderWidgetHostViewAura::CreateSelectionController() { |
| 2247 ui::TouchSelectionController::Config tsc_config; | 2245 ui::TouchSelectionController::Config tsc_config; |
| 2248 tsc_config.max_tap_duration = base::TimeDelta::FromMilliseconds( | 2246 tsc_config.max_tap_duration = base::TimeDelta::FromMilliseconds( |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2371 | 2369 |
| 2372 void RenderWidgetHostViewAura::SetPopupChild( | 2370 void RenderWidgetHostViewAura::SetPopupChild( |
| 2373 RenderWidgetHostViewAura* popup_child_host_view) { | 2371 RenderWidgetHostViewAura* popup_child_host_view) { |
| 2374 popup_child_host_view_ = popup_child_host_view; | 2372 popup_child_host_view_ = popup_child_host_view; |
| 2375 event_handler_->SetPopupChild( | 2373 event_handler_->SetPopupChild( |
| 2376 popup_child_host_view, | 2374 popup_child_host_view, |
| 2377 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); | 2375 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); |
| 2378 } | 2376 } |
| 2379 | 2377 |
| 2380 } // namespace content | 2378 } // namespace content |
| OLD | NEW |