| Index: views/widget/widget_gtk.h
|
| diff --git a/views/widget/widget_gtk.h b/views/widget/widget_gtk.h
|
| index 396a62d435480db037a07015c0682cb479e2a924..d813ed5ece57ac4f69c5c5e8444af18d30fa23b8 100644
|
| --- a/views/widget/widget_gtk.h
|
| +++ b/views/widget/widget_gtk.h
|
| @@ -13,7 +13,6 @@
|
| #include "ui/base/x/active_window_watcher_x.h"
|
| #include "ui/gfx/size.h"
|
| #include "views/focus/focus_manager.h"
|
| -#include "views/ime/input_method_delegate.h"
|
| #include "views/widget/native_widget.h"
|
| #include "views/widget/widget.h"
|
|
|
| @@ -31,7 +30,6 @@ using ui::OSExchangeDataProviderGtk;
|
| namespace views {
|
|
|
| class DropTargetGtk;
|
| -class InputMethod;
|
| class TooltipManagerGtk;
|
| class View;
|
| class WindowGtk;
|
| @@ -43,8 +41,7 @@ class NativeWidgetDelegate;
|
| // Widget implementation for GTK.
|
| class WidgetGtk : public Widget,
|
| public NativeWidget,
|
| - public ui::ActiveWindowWatcherX::Observer,
|
| - public internal::InputMethodDelegate {
|
| + public ui::ActiveWindowWatcherX::Observer {
|
| public:
|
| // Type of widget.
|
| enum Type {
|
| @@ -305,7 +302,7 @@ class WidgetGtk : public Widget,
|
| virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
|
|
|
| // Overridden from internal::InputMethodDelegate
|
| - virtual void DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE;
|
| + virtual bool DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE;
|
|
|
| // This is called only when the window is transparent.
|
| CHROMEGTK_CALLBACK_1(WidgetGtk, gboolean, OnWindowPaint, GdkEventExpose*);
|
|
|