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 7464afb7282fe829dcb3e21d8969840f8424801a..2e9652d70d98ed737d5179baa17ac1b238facd5b 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();
@@ -420,10 +418,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,7 +438,7 @@ class WidgetWin : public ui::WindowImpl,
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
 
   // Overridden from internal::InputMethodDelegate
-  virtual void DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE;
+  virtual bool DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE;
 
   // A delegate implementation that handles events received here.
   internal::NativeWidgetDelegate* delegate_;