Consolidate OnKeyEvent and InputMethod code.

views/widget/widget_win.h

Index: views/widget/widget_win.h
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h
index 778606b80df8e4a1016d2a55ed807474118fdd60..42d87d0ca2f2d09223e278b689bde1023f8166f6 100644
--- a/views/widget/widget_win.h
+++ b/views/widget/widget_win.h
@@ -20,7 +20,6 @@
 #include "base/win/scoped_comptr.h"
 #include "ui/base/win/window_impl.h"
 #include "views/focus/focus_manager.h"
-#include "views/ime/input_method_delegate.h"
 #include "views/layout/layout_manager.h"
 #include "views/widget/native_widget.h"
 #include "views/widget/widget.h"
@@ -82,8 +81,7 @@ const int WM_NCUAHDRAWFRAME = 0xAF;
 class WidgetWin : public ui::WindowImpl,
                   public Widget,
                   public NativeWidget,
-                  public MessageLoopForUI::Observer,
-                  public internal::InputMethodDelegate {
+                  public MessageLoopForUI::Observer {
  public:
   WidgetWin();
   virtual ~WidgetWin();
@@ -421,10 +419,6 @@ class WidgetWin : public ui::WindowImpl,
   // first ancestor that is a Window.
   static Window* GetWindowImpl(HWND hwnd);
 
-  // Returns the RootView that contains the focused view, or NULL if there is no
-  // focused view.
-  RootView* GetFocusedViewRootView();
-
   // Called after the WM_ACTIVATE message has been processed by the default
   // windows procedure.
   static void PostProcessActivateMessage(WidgetWin* widget,
@@ -444,9 +438,6 @@ class WidgetWin : public ui::WindowImpl,
   // Overridden from NativeWidget.
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
 
-  // Overridden from internal::InputMethodDelegate
-  virtual void DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE;
-
   // A delegate implementation that handles events received here.
   internal::NativeWidgetDelegate* delegate_;