Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(646)

Unified Diff: ui/base/ime/chromeos/character_composer.h

Issue 1284433002: Revise ui::DomKey to unify character and non-character codes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IsDead Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/base/ime/chromeos/character_composer.h
diff --git a/ui/base/ime/chromeos/character_composer.h b/ui/base/ime/chromeos/character_composer.h
index bcb4db90bc086fc9993df6d4cfbe8d8c0f778c19..78fae696f26d70b6b14cffbbe94cb4c9acef9151 100644
--- a/ui/base/ime/chromeos/character_composer.h
+++ b/ui/base/ime/chromeos/character_composer.h
@@ -9,21 +9,16 @@
#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();
@@ -68,7 +63,7 @@ class UI_BASE_IME_EXPORT CharacterComposer {
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_;
« no previous file with comments | « content/browser/renderer_host/web_input_event_aura_unittest.cc ('k') | ui/base/ime/chromeos/character_composer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698