| 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 0f8dbdef6db226f496c45c7356b857b8eaf7b1e9..d62ee7934aaacdb1d943605ebab852110736bbc7 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| @@ -109,8 +109,8 @@
|
|
|
| #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
| #include "content/common/input_messages.h"
|
| -#include "ui/events/linux/text_edit_command_auralinux.h"
|
| -#include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
|
| +#include "ui/base/ime/linux/text_edit_command_auralinux.h"
|
| +#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
|
| #endif
|
|
|
| using gfx::RectToSkIRect;
|
| @@ -1687,12 +1687,13 @@ void RenderWidgetHostViewAura::EnsureCaretInRect(const gfx::Rect& rect) {
|
| ConvertRectFromScreen(intersected_rect));
|
| }
|
|
|
| -bool RenderWidgetHostViewAura::IsEditCommandEnabled(int command_id) const {
|
| +bool RenderWidgetHostViewAura::IsTextEditCommandEnabled(
|
| + ui::TextEditCommand command) const {
|
| return false;
|
| }
|
|
|
| -void RenderWidgetHostViewAura::SetEditCommandForNextKeyEvent(int command_id) {
|
| -}
|
| +void RenderWidgetHostViewAura::SetTextEditCommandForNextKeyEvent(
|
| + ui::TextEditCommand command) {}
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // RenderWidgetHostViewAura, display::DisplayObserver implementation:
|
|
|