sk6_charactercomposer: Merged DispatchKeyEvent and its fabricated version.

ui/base/ime/input_method_base.cc

 // Copyright (c) 2012 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.
 
 #include "ui/base/ime/input_method_base.h"
 
 #include "base/logging.h"
 #include "ui/base/ime/input_method_delegate.h"
 #include "ui/base/ime/input_method_observer.h"
 #include "ui/base/ime/text_input_client.h"
+#include "ui/events/event.h"
 
 namespace ui {
 
 InputMethodBase::InputMethodBase()
   : delegate_(NULL),
     text_input_client_(NULL),
     system_toplevel_window_focused_(false) {
 }
 
 InputMethodBase::~InputMethodBase() {
@@ skipping 89 matching lines @@
   return GetTextInputType() == TEXT_INPUT_TYPE_NONE;
 }
 
 void InputMethodBase::OnInputMethodChanged() const {
   TextInputClient* client = GetTextInputClient();
   if (!IsTextInputTypeNone())
     client->OnInputMethodChanged();
 }
 
 bool InputMethodBase::DispatchKeyEventPostIME(
-    const base::NativeEvent& native_event) const {
-  return delegate_ ? delegate_->DispatchKeyEventPostIME(native_event) : false;
-}
+    const ui::KeyEvent& event) const {
+  if (!delegate_)
+    return false;
 
-bool InputMethodBase::DispatchFabricatedKeyEventPostIME(EventType type,
-                                                        KeyboardCode key_code,
-                                                        int flags) const {
-  return delegate_ ? delegate_->DispatchFabricatedKeyEventPostIME
-      (type, key_code, flags) : false;
+  if (event.HasNativeEvent())
+    return delegate_->DispatchKeyEventPostIME(event);
+  else
+    return delegate_->DispatchFabricatedKeyEventPostIME(event.type(),
+                                                        event.key_code(),
+                                                        event.flags());
 }
 
 void InputMethodBase::NotifyTextInputStateChanged(
     const TextInputClient* client) {
   FOR_EACH_OBSERVER(InputMethodObserver,
                     observer_list_,
                     OnTextInputStateChanged(client));
 }
 
 void InputMethodBase::SetFocusedTextInputClientInternal(
     TextInputClient* client) {
   TextInputClient* old = text_input_client_;
   OnWillChangeFocusedClient(old, client);
   text_input_client_ = client;  // NULL allowed.
   OnDidChangeFocusedClient(old, client);
   NotifyTextInputStateChanged(text_input_client_);
 }
 
 }  // namespace ui