Consolidate OnKeyEvent and InputMethod code.

views/widget/widget.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_H_
 #define VIEWS_WIDGET_WIDGET_H_
 #pragma once
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/gfx/native_widget_types.h"
 #include "views/focus/focus_manager.h"
+#include "views/ime/input_method_delegate.h"
 #include "views/widget/native_widget_delegate.h"
 
 namespace gfx {
 class Canvas;
 class Path;
 class Point;
 class Rect;
 }
 
 namespace ui {
@@ skipping 26 matching lines @@
 //  context specific NativeWidget implementation.
 //
 //  TODO(beng): Note that this class being non-abstract means that we have a
 //              violation of Google style in that we are using multiple
 //              inheritance. The intention is to split this into a separate
 //              object associated with but not equal to a NativeWidget
 //              implementation. Multiple inheritance is required for this
 //              transitional step.
 //
 class Widget : public internal::NativeWidgetDelegate,
-               public FocusTraversable {
+               public FocusTraversable,
+               public internal::InputMethodDelegate {
  public:
   struct CreateParams {
     enum Type {
       TYPE_WINDOW,      // A Window, like a frame window.
       TYPE_CONTROL,     // A control, like a button.
       TYPE_POPUP,       // An undecorated Window, with transient properties.
       TYPE_MENU         // An undecorated Window, with transient properties
                         // specialized to menus.
     };
 
@@ skipping 219 matching lines @@
   // Debugging code to help track 77651.
   bool got_native_widget_created() const { return got_native_widget_created_; }
 
   // Overridden from NativeWidgetDelegate:
   virtual void OnNativeFocus(gfx::NativeView focused_view) OVERRIDE;
   virtual void OnNativeBlur(gfx::NativeView focused_view) OVERRIDE;
   virtual void OnNativeWidgetCreated() OVERRIDE;
   virtual void OnSizeChanged(const gfx::Size& new_size) OVERRIDE;
   virtual bool HasFocusManager() const OVERRIDE;
   virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual bool OnKeyEvent(const KeyEvent& event) OVERRIDE;
   virtual bool OnMouseEvent(const MouseEvent& event) OVERRIDE;
   virtual void OnMouseCaptureLost() OVERRIDE;
 
   // Overridden from FocusTraversable:
   virtual FocusSearch* GetFocusSearch() OVERRIDE;
   virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE;
   virtual View* GetFocusTraversableParentView() OVERRIDE;
 
+  // Overridden from internal::InputMethodDelegate
+  virtual bool DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE;
+
  protected:
   // Creates the RootView to be used within this Widget. Subclasses may override
   // to create custom RootViews that do specialized event processing.
   // TODO(beng): Investigate whether or not this is needed.
   virtual RootView* CreateRootView();
 
   // Provided to allow the WidgetWin/Gtk implementations to destroy the RootView
   // _before_ the focus manager/tooltip manager.
   // TODO(beng): remove once we fold those objects onto this one.
   void DestroyRootView();
@@ skipping 59 matching lines @@
 
   // Debugging code to help track 77651.
   bool got_native_widget_created_;
 
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif // VIEWS_WIDGET_WIDGET_H_