Consolidate OnKeyEvent and InputMethod code.

views/ime/input_method_win.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_IME_INPUT_METHOD_WIN_H_
 #define VIEWS_IME_INPUT_METHOD_WIN_H_
 #pragma once
 
 #include <windows.h>
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/base/win/ime_input.h"
 #include "views/ime/input_method_base.h"
 #include "views/view.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 // An InputMethod implementation based on Windows IMM32 API.
 class InputMethodWin : public InputMethodBase {
  public:
-  explicit InputMethodWin(internal::InputMethodDelegate* delegate);
+  InputMethodWin();
   virtual ~InputMethodWin();
 
   // Overridden from InputMethod:
   virtual void Init(Widget* widget) OVERRIDE;
   virtual void OnFocus() OVERRIDE;
   virtual void OnBlur() OVERRIDE;
-  virtual void DispatchKeyEvent(const KeyEvent& key) OVERRIDE;
+  virtual bool OnKeyEvent(const KeyEvent& key) OVERRIDE;
   virtual void OnTextInputTypeChanged(View* view) OVERRIDE;
   virtual void OnCaretBoundsChanged(View* view) OVERRIDE;
   virtual void CancelComposition(View* view) OVERRIDE;
   virtual std::string GetInputLocale() OVERRIDE;
   virtual base::i18n::TextDirection GetInputTextDirection() OVERRIDE;
   virtual bool IsActive() OVERRIDE;
 
   // Message handlers. The native widget is responsible for forwarding following
   // messages to the input method.
   void OnInputLangChange(DWORD character_set, HKL input_language_id);
@@ skipping 43 matching lines @@
   // Windows IMM32 wrapper.
   // (See "ui/base/win/ime_input.h" for its details.)
   ui::ImeInput ime_input_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodWin);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_IME_INPUT_METHOD_WIN_H_