Consolidate OnKeyEvent and InputMethod code.

views/widget/widget_gtk.h

 // Copyright (c) 2011 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 VIEWS_WIDGET_WIDGET_GTK_H_
 #define VIEWS_WIDGET_WIDGET_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
 #include "base/message_loop.h"
 #include "ui/base/gtk/gtk_signal.h"
 #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"
 
 namespace gfx {
 class Rect;
 }
 
 namespace ui {
 class OSExchangeData;
 class OSExchangeDataProviderGtk;
 }
 using ui::OSExchangeData;
 using ui::OSExchangeDataProviderGtk;
 
 namespace views {
 
 class DropTargetGtk;
-class InputMethod;
 class TooltipManagerGtk;
 class View;
 class WindowGtk;
 
 namespace internal {
 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 {
     // Used for popup type windows (bubbles, menus ...).
     // NOTE: on X windows of this type can NOT get focus. If you need a popup
     // like widget that can be focused use TYPE_WINDOW and set the window type
     // to WINDOW_TYPE_CHROME_INFO_BUBBLE.
     TYPE_POPUP,
 
     // A top level window with no title or control buttons.
@@ skipping 239 matching lines @@
   class DropObserver;
   friend class DropObserver;
 
   // Overridden from Widget
   virtual RootView* CreateRootView() OVERRIDE;
 
   // Overridden from NativeWidget
   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*);
 
   // Callbacks for expose event on child widgets. See the description of
   // RegisterChildChildExposeHandler.
   void OnChildExpose(GtkWidget* child);
   static gboolean ChildExposeHandler(GtkWidget* widget, GdkEventExpose* event);
 
   // Returns the first ancestor of |widget| that is a window.
@@ skipping 112 matching lines @@
   bool painted_;
 
   scoped_ptr<InputMethod> input_method_;
 
   DISALLOW_COPY_AND_ASSIGN(WidgetGtk);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_WIDGET_WIDGET_GTK_H_