sk6_charactercomposer: Merged DispatchKeyEvent and its fabricated version.

ui/base/ime/input_method_linux_x11.h

 // Copyright 2013 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_LINUX_X11_H_
 #define UI_BASE_IME_INPUT_METHOD_LINUX_X11_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/ime/input_method_base.h"
 #include "ui/base/ime/linux/linux_input_method_context.h"
 
 typedef struct _GtkIMContext GtkIMContext;
 
 namespace ui {
 
 // A ui::InputMethod implementation for a X11 event loop on GNU/Linux.
 // This class is not designed for supporting CrOS.  The implementation details
 // are separated to ui::LinuxInputMethodContext interface.
 class InputMethodLinuxX11 : public InputMethodBase,
                             public LinuxInputMethodContextDelegate {
  public:
   explicit InputMethodLinuxX11(internal::InputMethodDelegate* delegate);
   virtual ~InputMethodLinuxX11();
 
   // Overriden from InputMethod.
   virtual void Init(bool focused) OVERRIDE;
   virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event,
                                         NativeEventResult* result) 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 OnTextInputTypeChanged(const TextInputClient* client) OVERRIDE;
   virtual void OnCaretBoundsChanged(const TextInputClient* client) OVERRIDE;
   virtual void CancelComposition(const TextInputClient* client) OVERRIDE;
   virtual void OnInputLocaleChanged() OVERRIDE;
   virtual std::string GetInputLocale() OVERRIDE;
   virtual base::i18n::TextDirection GetInputTextDirection() OVERRIDE;
   virtual bool IsActive() OVERRIDE;
   virtual bool IsCandidatePopupOpen() const OVERRIDE;
 
@@ skipping 11 matching lines @@
 
  private:
   scoped_ptr<LinuxInputMethodContext> input_method_context_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodLinuxX11);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_IME_INPUT_METHOD_LINUX_X11_H_