Merge 260900 "linux_aura: Port GtkKeybindingsHandler to Aura."

ui/views/linux_ui/linux_ui.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_VIEWS_LINUX_UI_LINUX_UI_H_
 #define UI_VIEWS_LINUX_UI_LINUX_UI_H_
 
 #include <string>
 
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/ime/linux/linux_input_method_context_factory.h"
+#include "ui/events/x/text_edit_key_bindings_delegate_x11.h"
 #include "ui/gfx/linux_font_delegate.h"
 #include "ui/shell_dialogs/linux_shell_dialog.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/linux_ui/status_icon_linux.h"
 #include "ui/views/views_export.h"
 
 // The main entrypoint into Linux toolkit specific code. GTK code should only
 // be executed behind this interface.
 
 namespace gfx {
@@ skipping 13 matching lines @@
 
 // Adapter class with targets to render like different toolkits. Set by any
 // project that wants to do linux desktop native rendering.
 //
 // TODO(erg): We're hardcoding GTK2, when we'll need to have backends for (at
 // minimum) GTK2 and GTK3. LinuxUI::instance() should actually be a very
 // complex method that pokes around with dlopen against a libuigtk2.so, a
 // liuigtk3.so, etc.
 class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory,
                              public gfx::LinuxFontDelegate,
-                             public ui::LinuxShellDialog {
+                             public ui::LinuxShellDialog,
+                             public ui::TextEditKeyBindingsDelegateX11 {
  public:
   virtual ~LinuxUI() {}
 
   // Sets the dynamically loaded singleton that draws the desktop native UI.
   static void SetInstance(LinuxUI* instance);
 
   // Returns a LinuxUI instance for the toolkit used in the user's desktop
   // environment.
   //
   // Can return NULL, in case no toolkit has been set. (For example, if we're
@@ skipping 72 matching lines @@
   // Notifies the window manager that start up has completed.
   // Normally Chromium opens a new window on startup and GTK does this
   // automatically. In case Chromium does not open a new window on startup,
   // e.g. an existing browser window already exists, this should be called.
   virtual void NotifyWindowManagerStartupComplete() = 0;
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_LINUX_UI_LINUX_UI_H_