[Ozone] Fix ui::Event::GetCharacter() when Ctrl is pressed

ui/events/event.cc

Index: ui/events/event.cc
diff --git a/ui/events/event.cc b/ui/events/event.cc
index d0966da00847a13bcfe64258596a445fa57bd0e4..fbb12c6b2d97545296fc8414d10ee55012f1ca20 100644
--- a/ui/events/event.cc
+++ b/ui/events/event.cc
@@ -782,8 +782,14 @@ void KeyEvent::ApplyLayout() const {
   // TODO(kpschoedel): set key_ field for X11.
 #elif defined(USE_OZONE)

[kpschoedel, 2015/01/26 19:34:22]

This code isn't run for normal key events (only for the "incomplete" synthetic
KeyEvent constructors used mostly by tests), and should soon go away (see
crbug.com/444045 and the discussion linked there). Ideally the keyboard layout
using xkb should be completely determined by the xkb layout configuration files
(in the xkeyboard-config package) but if there's a need to override that it
should be in XkbKeyboardLayoutEngine::Lookup(), so that it's applied
universally.

   KeyboardCode key_code;
-  if (!KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()->Lookup(
+  if (KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()->Lookup(
       code_, flags(), &key_, &character_, &key_code, &platform_keycode_)) {
+    if (IsControlDown()) {
+      // Use GetCharacterFromKeyCode() to set |character_| to 0x0 for keys that
+      // we do not care about.
+      character_ = GetCharacterFromKeyCode(key_code_, flags());
+    }
+  } else {
     GetMeaningFromKeyCode(key_code_, flags(), &key_, &character_);
   }
 #else