sk6_charactercomposer: Merged DispatchKeyEvent and its fabricated version.

ui/base/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 UI_BASE_IME_INPUT_METHOD_WIN_H_
 #define UI_BASE_IME_INPUT_METHOD_WIN_H_
 
 #include <windows.h>
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/base/ime/input_method_base.h"
 #include "ui/base/ime/win/imm32_manager.h"
 
 namespace ui {
 
 // A common InputMethod implementation shared between IMM32 and TSF.
 class UI_EXPORT InputMethodWin : public InputMethodBase {
  public:
   InputMethodWin(internal::InputMethodDelegate* delegate,
                  HWND toplevel_window_handle);
 
   // Overridden from InputMethod:
   virtual void Init(bool focused) OVERRIDE;
-  virtual bool DispatchKeyEvent(
-      const base::NativeEvent& native_key_event) OVERRIDE;
+  virtual bool DispatchKeyEvent(const ui::KeyEvent& event) OVERRIDE;
   virtual bool DispatchFabricatedKeyEvent(const ui::KeyEvent& event) OVERRIDE;
   virtual void OnInputLocaleChanged() OVERRIDE;
   virtual std::string GetInputLocale() OVERRIDE;
   virtual base::i18n::TextDirection GetInputTextDirection() OVERRIDE;
   virtual bool IsActive() OVERRIDE;
 
  protected:
   // Some IMEs rely on WM_IME_REQUEST message even when TSF is enabled. So
   // OnImeRequest (and its actual implementations as OnDocumentFeed,
   // OnReconvertString, and OnQueryCharPosition) are placed in this base class.
@@ skipping 46 matching lines @@
   // pressing ctrl-shift. It'll be sent to the text input client when the key
   // is released.
   base::i18n::TextDirection pending_requested_direction_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodWin);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_IME_INPUT_METHOD_WIN_H_