Revise ui::DomKey to unify character and non-character codes.

chrome/browser/chromeos/events/event_rewriter.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_EVENTS_EVENT_REWRITER_H_
 #define CHROME_BROWSER_CHROMEOS_EVENTS_EVENT_REWRITER_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event.h"
 #include "ui/events/event_rewriter.h"
+#include "ui/events/keycodes/dom/dom_key.h"
 
 class PrefService;
 
 namespace ash {
 class StickyKeysController;
 }
 
 namespace ui {
 enum class DomCode;
-enum class DomKey;
 };
 
 namespace chromeos {
 namespace input_method {
 class ImeKeyboard;
 }
 
 // EventRewriter makes various changes to keyboard-related events,
 // including KeyEvents and some other events with keyboard modifier flags:
 // - maps modifiers keys (Control, Alt, Search, Caps, Diamond) according
@@ skipping 10 matching lines @@
     kDeviceUnknown = 0,
     kDeviceAppleKeyboard,
     kDeviceHotrodRemote,
     kDeviceVirtualCoreKeyboard,  // X-server generated events.
   };
 
   // Things that keyboard-related rewriter phases can change about an Event.
   struct MutableKeyState {
     int flags;
     ui::DomCode code;
-    ui::DomKey key;
-    base::char16 character;
+    ui::DomKey::Base key;
     ui::KeyboardCode key_code;
   };
 
   // Does not take ownership of the |sticky_keys_controller|, which may also
   // be NULL (for testing without ash), in which case sticky key operations
   // don't happen.
   explicit EventRewriter(ash::StickyKeysController* sticky_keys_controller);
   ~EventRewriter() override;
 
   // Calls KeyboardDeviceAddedInternal.
@@ skipping 135 matching lines @@
   int pressed_modifier_latches_;
   int latched_modifier_latches_;
   int used_modifier_latches_;
 
   DISALLOW_COPY_AND_ASSIGN(EventRewriter);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_EVENTS_EVENT_REWRITER_H_