linux_aura: Port GtkKeybindingsHandler to Aura.

content/browser/renderer_host/render_widget_host_view_aura.cc

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 daf80cbdeceb6015c871c26b37ddaedf1161827e..a269c34764249fd2d983ff3ed10feec00f871271 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -34,6 +34,7 @@
 #include "content/browser/renderer_host/web_input_event_aura.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/common/gpu/gpu_messages.h"
+#include "content/common/input_messages.h"
 #include "content/common/view_messages.h"
 #include "content/port/browser/render_widget_host_view_frame_subscriber.h"
 #include "content/port/browser/render_widget_host_view_port.h"
@@ -90,6 +91,11 @@
 #include "ui/gfx/win/dpi.h"
 #endif
 
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#include "content/public/browser/keybinding_handler_aurax11.h"
+#include "content/public/browser/keybinding_handler_factory_aurax11.h"
+#endif
+
 using gfx::RectToSkIRect;
 using gfx::SkIRectToRect;
 
@@ -520,6 +526,7 @@ bool RenderWidgetHostViewAura::OnMessageReceived(
 
 void RenderWidgetHostViewAura::InitAsChild(
     gfx::NativeView parent_view) {
+  DoSharedInit();
   window_->SetType(ui::wm::WINDOW_TYPE_CONTROL);
   window_->Init(aura::WINDOW_LAYER_TEXTURED);
   window_->SetName("RenderWidgetHostViewAura");
@@ -530,6 +537,7 @@ void RenderWidgetHostViewAura::InitAsPopup(
     const gfx::Rect& bounds_in_screen) {
   popup_parent_host_view_ =
       static_cast<RenderWidgetHostViewAura*>(parent_host_view);
+  DoSharedInit();
 
   // TransientWindowClient may be NULL during tests.
   aura::client::TransientWindowClient* transient_window_client =
@@ -574,6 +582,7 @@ void RenderWidgetHostViewAura::InitAsPopup(
 
 void RenderWidgetHostViewAura::InitAsFullscreen(
     RenderWidgetHostView* reference_host_view) {
+  DoSharedInit();
   is_fullscreen_ = true;
   window_->SetType(ui::wm::WINDOW_TYPE_NORMAL);
   window_->Init(aura::WINDOW_LAYER_TEXTURED);
@@ -2376,7 +2385,7 @@ void RenderWidgetHostViewAura::InsertChar(base::char16 ch, int flags) {
                                         ch,
                                         flags,
                                         now);
-    host_->ForwardKeyboardEvent(webkit_event);
+    ForwardKeyboardEvent(webkit_event);
   }
 }
 
@@ -2817,10 +2826,10 @@ void RenderWidgetHostViewAura::OnKeyEvent(ui::KeyEvent* event) {
           event->is_char() ? event->GetCharacter() : event->key_code(),
           event->flags(),
           ui::EventTimeForNow().InSecondsF());
-      host_->ForwardKeyboardEvent(webkit_event);
+      ForwardKeyboardEvent(webkit_event);
     } else {
       NativeWebKeyboardEvent webkit_event(event);
-      host_->ForwardKeyboardEvent(webkit_event);
+      ForwardKeyboardEvent(webkit_event);
     }
   }
   event->SetHandled();
@@ -3369,6 +3378,12 @@ RenderWidgetHostViewAura::~RenderWidgetHostViewAura() {
   DCHECK(!vsync_manager_);
 }
 
+void RenderWidgetHostViewAura::DoSharedInit() {
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+  key_bindings_handler_.reset(KeybindingHandlerFactoryAuraX11::Build());
+#endif
+}
+
 void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() {
   const gfx::Point screen_point =
       gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint();
@@ -3593,6 +3608,25 @@ void RenderWidgetHostViewAura::DetachFromInputMethod() {
     input_method->SetFocusedTextInputClient(NULL);
 }
 
+void RenderWidgetHostViewAura::ForwardKeyboardEvent(
+    const NativeWebKeyboardEvent& event) {
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+  EditCommands edit_commands;
+  if (!event.skip_in_browser &&
+      key_bindings_handler_ &&
+      key_bindings_handler_->Match(event, &edit_commands)) {
+    host_->Send(new InputMsg_SetEditCommandsForNextKeyEvent(
+        host_->GetRoutingID(), edit_commands));
+    NativeWebKeyboardEvent copy_event(event);
+    copy_event.match_edit_command = true;
+    host_->ForwardKeyboardEvent(copy_event);
+    return;
+  }
+#endif
+
+  host_->ForwardKeyboardEvent(event);
+}
+
 void RenderWidgetHostViewAura::LockResources() {
   DCHECK(frame_provider_);
   delegated_frame_evictor_->LockFrame();