| 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 2224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2235 event.os_event && | 2235 event.os_event && |
| 2236 keybinding_delegate->MatchEvent(*event.os_event, &commands)) { | 2236 keybinding_delegate->MatchEvent(*event.os_event, &commands)) { |
| 2237 // Transform from ui/ types to content/ types. | 2237 // Transform from ui/ types to content/ types. |
| 2238 EditCommands edit_commands; | 2238 EditCommands edit_commands; |
| 2239 for (std::vector<ui::TextEditCommandAuraLinux>::const_iterator it = | 2239 for (std::vector<ui::TextEditCommandAuraLinux>::const_iterator it = |
| 2240 commands.begin(); it != commands.end(); ++it) { | 2240 commands.begin(); it != commands.end(); ++it) { |
| 2241 edit_commands.push_back(EditCommand(it->GetCommandString(), | 2241 edit_commands.push_back(EditCommand(it->GetCommandString(), |
| 2242 it->argument())); | 2242 it->argument())); |
| 2243 } | 2243 } |
| 2244 | 2244 |
| 2245 target_host->Send(new InputMsg_SetEditCommandsForNextKeyEvent( | 2245 target_host->ForwardKeyboardEventWithCommands(event, &edit_commands); |
| 2246 target_host->GetRoutingID(), edit_commands)); | |
| 2247 target_host->ForwardKeyboardEvent(event); | |
| 2248 return; | 2246 return; |
| 2249 } | 2247 } |
| 2250 #endif | 2248 #endif |
| 2251 | 2249 |
| 2252 target_host->ForwardKeyboardEvent(event); | 2250 target_host->ForwardKeyboardEvent(event); |
| 2253 } | 2251 } |
| 2254 | 2252 |
| 2255 void RenderWidgetHostViewAura::CreateSelectionController() { | 2253 void RenderWidgetHostViewAura::CreateSelectionController() { |
| 2256 ui::TouchSelectionController::Config tsc_config; | 2254 ui::TouchSelectionController::Config tsc_config; |
| 2257 tsc_config.max_tap_duration = base::TimeDelta::FromMilliseconds( | 2255 tsc_config.max_tap_duration = base::TimeDelta::FromMilliseconds( |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2380 | 2378 |
| 2381 void RenderWidgetHostViewAura::SetPopupChild( | 2379 void RenderWidgetHostViewAura::SetPopupChild( |
| 2382 RenderWidgetHostViewAura* popup_child_host_view) { | 2380 RenderWidgetHostViewAura* popup_child_host_view) { |
| 2383 popup_child_host_view_ = popup_child_host_view; | 2381 popup_child_host_view_ = popup_child_host_view; |
| 2384 event_handler_->SetPopupChild( | 2382 event_handler_->SetPopupChild( |
| 2385 popup_child_host_view, | 2383 popup_child_host_view, |
| 2386 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); | 2384 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); |
| 2387 } | 2385 } |
| 2388 | 2386 |
| 2389 } // namespace content | 2387 } // namespace content |
| OLD | NEW |