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

ui/base/ime/chromeos/character_composer.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_CHROMEOS_CHARACTER_COMPOSER_H_
 #define UI_BASE_IME_CHROMEOS_CHARACTER_COMPOSER_H_
 
 #include <vector>
 
 #include "base/strings/string_util.h"
 #include "ui/base/ime/ui_base_ime_export.h"
+#include "ui/events/keycodes/dom/dom_key.h"
 
 namespace ui {
 class KeyEvent;
-enum class DomKey;
 
 // A class to recognize compose and dead key sequence.
 // Outputs composed character.
 class UI_BASE_IME_EXPORT CharacterComposer {
  public:
-  struct KeystrokeMeaning {
-    KeystrokeMeaning(DomKey k, base::char16 c) : key(k), character(c) {}
-    DomKey key;
-    base::char16 character;
-  };
-  using ComposeBuffer = std::vector<KeystrokeMeaning>;
+  using ComposeBuffer = std::vector<DomKey>;
 
   CharacterComposer();
   ~CharacterComposer();
 
   void Reset();
 
   // Filters keypress.
   // Returns true if the keypress is recognized as a part of composition
   // sequence.
   // Fabricated events which don't have the native event, are not supported.
@@ skipping 24 matching lines @@
   // Filters keypress in hexadecimal mode.
   bool FilterKeyPressHexMode(const ui::KeyEvent& event);
 
   // Commit a character composed from hexadecimal uncode sequence
   void CommitHex();
 
   // Updates preedit string in hexadecimal mode.
   void UpdatePreeditStringHexMode();
 
   // Remembers keypresses previously filtered.
-  std::vector<KeystrokeMeaning> compose_buffer_;
+  std::vector<DomKey> compose_buffer_;
 
   // Records hexadecimal digits previously filtered.
   std::vector<unsigned int> hex_buffer_;
 
   // A string representing the composed character.
   base::string16 composed_character_;
 
   // Preedit string.
   base::string16 preedit_string_;
 
@@ skipping 40 matching lines @@
       uint32_t* composed_character) const override;
 
  private:
   bool Find(uint16_t index, uint16_t size, uint16_t key, uint16_t* value) const;
   const CompositionData& data_;
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_IME_CHROMEOS_CHARACTER_COMPOSER_H_