| 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..de702d561f0bb3542697e46fd0eb638d9b9ce89d 100644
|
| --- a/chrome/browser/ui/libgtk2ui/gtk2_ui.h
|
| +++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.h
|
| @@ -15,6 +15,7 @@
|
| #include "chrome/browser/ui/libgtk2ui/gtk2_signal_registrar.h"
|
| #include "chrome/browser/ui/libgtk2ui/libgtk2ui_export.h"
|
| #include "chrome/browser/ui/libgtk2ui/owned_widget_gtk2.h"
|
| +#include "content/public/browser/keybinding_handler_factory_aurax11.h"
|
| #include "ui/gfx/color_utils.h"
|
| #include "ui/gfx/geometry/insets.h"
|
| #include "ui/views/linux_ui/linux_ui.h"
|
| @@ -38,7 +39,8 @@ class GConfTitlebarListener;
|
|
|
| // Interface to GTK2 desktop features.
|
| //
|
| -class Gtk2UI : public views::LinuxUI {
|
| +class Gtk2UI : public views::LinuxUI,
|
| + public content::KeybindingHandlerFactoryAuraX11 {
|
| public:
|
| Gtk2UI();
|
| virtual ~Gtk2UI();
|
| @@ -110,6 +112,9 @@ class Gtk2UI : public views::LinuxUI {
|
| virtual bool UnityIsRunning() OVERRIDE;
|
| virtual void NotifyWindowManagerStartupComplete() OVERRIDE;
|
|
|
| + // content::KeybindingHandlerFactoryAuraX11:
|
| + virtual content::KeybindingHandlerAuraX11* Create() OVERRIDE;
|
| +
|
| private:
|
| typedef std::map<int, SkColor> ColorMap;
|
| typedef std::map<int, color_utils::HSL> TintMap;
|
|
|