Retires ui::TranslatedKeyEvent and replaces it with KeyEvent.

ui/events/event.cc

Index: ui/events/event.cc
diff --git a/ui/events/event.cc b/ui/events/event.cc
index 32fb97a2594a4dcb477b0203ddb2993e1eec2e03..d83fe4081acaccee7e9614473fe72f516d3e4b10 100644
--- a/ui/events/event.cc
+++ b/ui/events/event.cc
@@ -591,35 +591,33 @@ void KeyEvent::NormalizeFlags() {
     set_flags(flags() & ~mask);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// TranslatedKeyEvent
-
-TranslatedKeyEvent::TranslatedKeyEvent(const base::NativeEvent& native_event,
-                                       bool is_char)
-    : KeyEvent(native_event, is_char) {
-  SetType(type() == ET_KEY_PRESSED ?
-          ET_TRANSLATED_KEY_PRESS : ET_TRANSLATED_KEY_RELEASE);
-}
-
-TranslatedKeyEvent::TranslatedKeyEvent(bool is_press,
-                                       KeyboardCode key_code,
-                                       int flags)
-    : KeyEvent((is_press ? ET_TRANSLATED_KEY_PRESS : ET_TRANSLATED_KEY_RELEASE),
-               key_code,
-               flags,
-               false) {
-}
-
-TranslatedKeyEvent::TranslatedKeyEvent(const KeyEvent& key_event)
-    : KeyEvent(key_event) {
-  SetType(type() == ET_KEY_PRESSED ?
-          ET_TRANSLATED_KEY_PRESS : ET_TRANSLATED_KEY_RELEASE);
-  set_is_char(false);
+bool KeyEvent::IsTranslated() const {
+  switch (type()) {
+    case ET_KEY_PRESSED:
+    case ET_KEY_RELEASED:
+      return false;
+    case ET_TRANSLATED_KEY_PRESS:
+    case ET_TRANSLATED_KEY_RELEASE:

[sadrul, 2014/05/05 06:43:47]

Can we remove the _TRANSLATED_ types, and use a KeyEventFlags instead?

[Yuki, 2014/05/08 05:28:26]

ui::Accelerator seems distinguishing a translated key event from a regular key
event.  I don't yet fully understand the accelerator system, but we cannot
simply remove _TRANSLATED_ types.  I think it's technically possible to remove
_TRANSLATED_ types, but some changes may be needed in accelerator handling.

I think this is one of the reasons why we needed _TRANSLATED_ types.

It may be a big change, and I don't think we need such a big change now.

+      return true;
+    default:
+      NOTREACHED();
+      return false;
+  }
 }
 
-void TranslatedKeyEvent::ConvertToKeyEvent() {
-  SetType(type() == ET_TRANSLATED_KEY_PRESS ?
-          ET_KEY_PRESSED : ET_KEY_RELEASED);
+void KeyEvent::SetTranslated(bool translated) {
+  switch (type()) {
+    case ET_KEY_PRESSED:
+    case ET_TRANSLATED_KEY_PRESS:
+      SetType(translated ? ET_TRANSLATED_KEY_PRESS : ET_KEY_PRESSED);
+      break;
+    case ET_KEY_RELEASED:
+    case ET_TRANSLATED_KEY_RELEASE:
+      SetType(translated ? ET_TRANSLATED_KEY_RELEASE : ET_KEY_RELEASED);
+      break;
+    default:
+      NOTREACHED();
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////