[PATCH 2/11] ozone: evdev: Move KeyboardEvdev usage during dispatch to EventFactoryEvdev

ui/events/ozone/evdev/keyboard_evdev.cc

 // Copyright 2014 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/events/ozone/evdev/keyboard_evdev.h"
 
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/dom4/keycode_converter.h"
 #include "ui/events/ozone/evdev/event_modifiers_evdev.h"
+#include "ui/events/ozone/evdev/keyboard_util_evdev.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
 #include "ui/events/ozone/layout/layout_util.h"
 
 namespace ui {
 
 namespace {
 
-const int kXkbKeycodeOffset = 8;
-
 const int kRepeatDelayMs = 500;
 const int kRepeatIntervalMs = 50;
 
 int EventFlagToEvdevModifier(int flag) {
   switch (flag) {
     case EF_CAPS_LOCK_DOWN:
       return EVDEV_MODIFIER_CAPS_LOCK;
     case EF_SHIFT_DOWN:
       return EVDEV_MODIFIER_SHIFT;
     case EF_CONTROL_DOWN:
@@ skipping 143 matching lines @@
     UpdateModifier(ModifierDomKeyToEventFlag(dom_key), down);
 
   KeyEvent* event =
       new KeyEvent(down ? ET_KEY_PRESSED : ET_KEY_RELEASED, key_code, dom_code,
                    modifiers_->GetModifierFlags(), dom_key, character);
   if (platform_keycode)
     event->set_platform_keycode(platform_keycode);
   callback_.Run(make_scoped_ptr(event));
 }
 
-// static
-int KeyboardEvdev::NativeCodeToEvdevCode(int native_code) {
-  if (native_code == KeycodeConverter::InvalidNativeKeycode()) {
-    return KEY_RESERVED;
-  }
-  return native_code - kXkbKeycodeOffset;
-}
-
-// static
-int KeyboardEvdev::EvdevCodeToNativeCode(int evdev_code) {
-  if (evdev_code == KEY_RESERVED)
-    return KeycodeConverter::InvalidNativeKeycode();
-  return evdev_code + kXkbKeycodeOffset;
-}
-
 }  // namespace ui