| Index: chrome/browser/ui/libgtk2ui/gtk2_ui.h
|
| diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.h b/chrome/browser/ui/libgtk2ui/gtk2_ui.h
|
| index f965dc1d104a209032cd56187f35b26e13e5f82f..be08549312ea0803e75af9ac01c2db686204351c 100644
|
| --- a/chrome/browser/ui/libgtk2ui/gtk2_ui.h
|
| +++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.h
|
| @@ -19,6 +19,7 @@
|
| #include "ui/gfx/geometry/insets.h"
|
| #include "ui/views/linux_ui/linux_ui.h"
|
| #include "ui/views/window/frame_buttons.h"
|
| +#include "ui/wm/public/text_edit_key_bindings_delegate_x11.h"
|
|
|
| typedef struct _GdkColor GdkColor;
|
| typedef struct _GtkBorder GtkBorder;
|
| @@ -33,6 +34,7 @@ class Image;
|
|
|
| namespace libgtk2ui {
|
| class Gtk2Border;
|
| +class Gtk2KeyBindingsHandler;
|
| class Gtk2SignalRegistrar;
|
| class GConfTitlebarListener;
|
|
|
| @@ -110,6 +112,11 @@ class Gtk2UI : public views::LinuxUI {
|
| virtual bool UnityIsRunning() OVERRIDE;
|
| virtual void NotifyWindowManagerStartupComplete() OVERRIDE;
|
|
|
| + // ui::wm::TextEditKeybindingDelegate:
|
| + virtual bool MatchEvent(
|
| + const ui::Event& event,
|
| + std::vector<ui::wm::TextEditCommandX11>* commands) OVERRIDE;
|
| +
|
| private:
|
| typedef std::map<int, SkColor> ColorMap;
|
| typedef std::map<int, color_utils::HSL> TintMap;
|
| @@ -235,6 +242,8 @@ class Gtk2UI : public views::LinuxUI {
|
| std::vector<views::FrameButton> leading_buttons_;
|
| std::vector<views::FrameButton> trailing_buttons_;
|
|
|
| + scoped_ptr<Gtk2KeyBindingsHandler> key_bindings_handler_;
|
| +
|
| // Objects to notify when the window frame button order changes.
|
| ObserverList<views::WindowButtonOrderObserver> observer_list_;
|
|
|
|
|