Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(515)

Unified Diff: ui/views/linux_ui/linux_ui.h

Issue 235693002: Merge 260900 "linux_aura: Port GtkKeybindingsHandler to Aura." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1916/src/
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/x/text_edit_key_bindings_delegate_x11.cc ('k') | ui/views/linux_ui/linux_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/linux_ui/linux_ui.h
===================================================================
--- ui/views/linux_ui/linux_ui.h (revision 263301)
+++ ui/views/linux_ui/linux_ui.h (working copy)
@@ -9,6 +9,7 @@
#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"
@@ -42,7 +43,8 @@
// 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() {}
« no previous file with comments | « ui/events/x/text_edit_key_bindings_delegate_x11.cc ('k') | ui/views/linux_ui/linux_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698