Rename KEY_ constants to avoid conflict with <linux/input.h>

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 "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
+#include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/events/keycodes/dom/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 {
 
-// We can't include ui/events/keycodes/dom/dom_code.h here because of
-// conflicts with preprocessor macros in <linux/input.h>, so we use the
-// same underlying data with an additional prefix.
-#define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) DOM_CODE_ ## id = usb
-#define USB_KEYMAP_DECLARATION enum class DomCode
-#include "ui/events/keycodes/dom/keycode_converter_data.inc"
-#undef USB_KEYMAP
-#undef USB_KEYMAP_DECLARATION
-
 namespace {
 
 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:
@@ skipping 114 matching lines @@
 
 void KeyboardEvdev::RefreshModifiers() {
   // Release all keyboard modifiers.
   modifiers_->ResetKeyboardModifiers();
   // Press modifiers for currently held keys.
   for (int key = 0; key < KEY_CNT; ++key) {
     if (!key_state_.test(key))
       continue;
     DomCode dom_code =
         KeycodeConverter::NativeKeycodeToDomCode(EvdevCodeToNativeCode(key));
-    if (dom_code == DomCode::DOM_CODE_NONE)
+    if (dom_code == DomCode::NONE)
       continue;
     DomKey dom_key;
     KeyboardCode keycode;
     if (!keyboard_layout_engine_->Lookup(dom_code, EF_NONE, &dom_key, &keycode))
       continue;
     int flag = ModifierDomKeyToEventFlag(dom_key);
     if (flag == EF_NONE)
       continue;
     UpdateModifier(flag, true);
   }
@@ skipping 53 matching lines @@
   ScheduleKeyRepeat(repeat_interval_);
 }
 
 void KeyboardEvdev::DispatchKey(unsigned int key,
                                 bool down,
                                 bool repeat,
                                 base::TimeDelta timestamp,
                                 int device_id) {
   DomCode dom_code =
       KeycodeConverter::NativeKeycodeToDomCode(EvdevCodeToNativeCode(key));
-  if (dom_code == DomCode::DOM_CODE_NONE)
+  if (dom_code == DomCode::NONE)
     return;
   int flags = modifiers_->GetModifierFlags();
   DomKey dom_key;
   KeyboardCode key_code;
   if (!keyboard_layout_engine_->Lookup(dom_code, flags, &dom_key, &key_code))
     return;
   if (!repeat) {
     int flag = ModifierDomKeyToEventFlag(dom_key);
     UpdateModifier(flag, down);
   }
 
   KeyEvent event(down ? ET_KEY_PRESSED : ET_KEY_RELEASED, key_code, dom_code,
                  modifiers_->GetModifierFlags(), dom_key, timestamp);
   event.set_source_device_id(device_id);
   callback_.Run(&event);
 }
 
 }  // namespace ui