Fix typing of accented characters on the VK in Google Docs.

ui/keyboard/keyboard_util.cc

 // Copyright (c) 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.
 
 #include "ui/keyboard/keyboard_util.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "grit/keyboard_resources.h"
 #include "grit/keyboard_resources_map.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/keyboard/keyboard_switches.h"
 
 namespace {
 
 const char kKeyDown[] ="keydown";
 const char kKeyUp[] = "keyup";
 
+void sendProcessKeyEvent(ui::EventType type, aura::RootWindow* root_window) {

[sadrul, 2013/09/05 22:54:49]

SendProcessKeyEvent

[kevers, 2013/09/06 00:48:25]

Done.

+  ui::TranslatedKeyEvent event(type == ui::ET_KEY_PRESSED,
+                               ui::VKEY_PROCESSKEY,
+                               ui::EF_NONE);
+  root_window->AsRootWindowHostDelegate()->OnHostKeyEvent(&event);
+}
+
 }  // namespace
 
 namespace keyboard {
 
 bool IsKeyboardEnabled() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableVirtualKeyboard);
 }
 
 bool InsertText(const base::string16& text, aura::RootWindow* root_window) {
@@ skipping 65 matching lines @@
     event_type = ui::ET_KEY_RELEASED;
   if (event_type == ui::ET_UNKNOWN)
     return false;
 
   int flags = ui::EF_NONE;
   if (shift_modifier)
     flags = ui::EF_SHIFT_DOWN;
 
   ui::KeyboardCode code = static_cast<ui::KeyboardCode>(key_code);
 
-  ui::KeyEvent event(event_type, code, flags, false);
-  event.set_character(key_value);
-  event.set_unmodified_character(key_value);
+  if (code == ui::VKEY_UNKNOWN) {
+    // Handling of special printable characters (e.g. accented characters) for
+    // which there is no key code.
+    if (event_type == ui::ET_KEY_RELEASED) {
+      ui::InputMethod* input_method = root_window->GetProperty(
+          aura::client::kRootWindowInputMethodKey);
+      if (!input_method)
+        return false;
 
-  if (code != ui::VKEY_UNKNOWN) {
+      ui::TextInputClient* tic = input_method->GetTextInputClient();
+
+      sendProcessKeyEvent(ui::ET_KEY_PRESSED, root_window);
+      tic->InsertChar(static_cast<uint16>(key_value), ui::EF_NONE);
+      sendProcessKeyEvent(ui::ET_KEY_RELEASED, root_window);

[sadrul, 2013/09/05 22:54:49]

I think it'd be simpler if you do:

  SendProcessKeyEvent(....);
  InsertText(....);
  SendProcessKeyEvent(....);

Would that work?

[kevers, 2013/09/06 00:48:25]

InsertText does not work for web content as the text insertion appears before
the press event.  InsertChar yields the correct sequence of events, producing a
keypressed event between the keydown and keyup.

[sadrul, 2013/09/06 05:52:38]

Ah, I see. It feels a bit weird that InsertText() and InsertChar() don't
generate events in the same/similar sequence.

+    }
+  } else {
+    ui::KeyEvent event(event_type, code, flags, false);
     root_window->AsRootWindowHostDelegate()->OnHostKeyEvent(&event);
-  } else if (event_type == ui::ET_KEY_RELEASED) {
-    // TODO(kevers): Fix key handling to support key_value when code is
-    // VKEY_UNKNOWN.
-    base::string16 text;
-    text.push_back(static_cast<char16>(key_value));
-    InsertText(text, root_window);
   }
   return true;
 }
 
 const GritResourceMap* GetKeyboardExtensionResources(size_t* size) {
   // This looks a lot like the contents of a resource map; however it is
   // necessary to have a custom path for the extension path, so the resource
   // map cannot be used directly.
   static const GritResourceMap kKeyboardResources[] = {
     {"keyboard/api_adapter.js", IDR_KEYBOARD_API_ADAPTER_JS},
@@ skipping 31 matching lines @@
     {"keyboard/main.css", IDR_KEYBOARD_MAIN_CSS},
     {"keyboard/polymer.min.js", IDR_KEYBOARD_POLYMER},
     {"keyboard/voice_input.js", IDR_KEYBOARD_VOICE_INPUT_JS},
   };
   static const size_t kKeyboardResourcesSize = arraysize(kKeyboardResources);
   *size = kKeyboardResourcesSize;
   return kKeyboardResources;
 }
 
 }  // namespace keyboard