Hardware Keyboard: Windows

ci/licenses_golden/licenses_flutter

@@ -1487,6 +1487,7 @@ FILE: ../../../flutter/shell/platform/windows/cursor_handler.cc
 FILE: ../../../flutter/shell/platform/windows/cursor_handler.h
 FILE: ../../../flutter/shell/platform/windows/external_texture_gl.cc
 FILE: ../../../flutter/shell/platform/windows/external_texture_gl.h
+FILE: ../../../flutter/shell/platform/windows/flutter_key_map.cc
 FILE: ../../../flutter/shell/platform/windows/flutter_project_bundle.cc
 FILE: ../../../flutter/shell/platform/windows/flutter_project_bundle.h
 FILE: ../../../flutter/shell/platform/windows/flutter_project_bundle_unittests.cc
@@ -1503,10 +1504,16 @@ FILE: ../../../flutter/shell/platform/windows/flutter_windows_view.cc
 FILE: ../../../flutter/shell/platform/windows/flutter_windows_view.h
 FILE: ../../../flutter/shell/platform/windows/flutter_windows_win32.cc
 FILE: ../../../flutter/shell/platform/windows/flutter_windows_winuwp.cc
-FILE: ../../../flutter/shell/platform/windows/key_event_handler.cc
-FILE: ../../../flutter/shell/platform/windows/key_event_handler.h
-FILE: ../../../flutter/shell/platform/windows/key_event_handler_unittests.cc
-FILE: ../../../flutter/shell/platform/windows/keyboard_hook_handler.h
+FILE: ../../../flutter/shell/platform/windows/keyboard_handler_base.h
+FILE: ../../../flutter/shell/platform/windows/keyboard_key_channel_handler.cc
+FILE: ../../../flutter/shell/platform/windows/keyboard_key_channel_handler.h
+FILE: ../../../flutter/shell/platform/windows/keyboard_key_channel_handler_unittests.cc
+FILE: ../../../flutter/shell/platform/windows/keyboard_key_embedder_handler.cc
+FILE: ../../../flutter/shell/platform/windows/keyboard_key_embedder_handler.h
+FILE: ../../../flutter/shell/platform/windows/keyboard_key_embedder_handler_unittests.cc
+FILE: ../../../flutter/shell/platform/windows/keyboard_key_handler.cc
+FILE: ../../../flutter/shell/platform/windows/keyboard_key_handler.h
+FILE: ../../../flutter/shell/platform/windows/keyboard_key_handler_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/platform_handler.cc
 FILE: ../../../flutter/shell/platform/windows/platform_handler.h
 FILE: ../../../flutter/shell/platform/windows/platform_handler_unittests.cc

shell/platform/windows/BUILD.gn

@@ -49,6 +49,7 @@ source_set("flutter_windows_source") {
     "cursor_handler.h",
     "external_texture_gl.cc",
     "external_texture_gl.h",
+    "flutter_key_map.cc",
     "flutter_project_bundle.cc",
     "flutter_project_bundle.h",
     "flutter_windows.cc",
@@ -58,9 +59,13 @@ source_set("flutter_windows_source") {
     "flutter_windows_texture_registrar.h",
     "flutter_windows_view.cc",
     "flutter_windows_view.h",
-    "key_event_handler.cc",
-    "key_event_handler.h",
-    "keyboard_hook_handler.h",
+    "keyboard_handler_base.h",
+    "keyboard_key_channel_handler.cc",
+    "keyboard_key_channel_handler.h",
+    "keyboard_key_embedder_handler.cc",
+    "keyboard_key_embedder_handler.h",
+    "keyboard_key_handler.cc",
+    "keyboard_key_handler.h",
     "platform_handler.cc",
     "platform_handler.h",
     "string_conversion.cc",
@@ -195,7 +200,9 @@ executable("flutter_windows_unittests") {
       "flutter_project_bundle_unittests.cc",
       "flutter_windows_engine_unittests.cc",
       "flutter_windows_texture_registrar_unittests.cc",
-      "key_event_handler_unittests.cc",
+      "keyboard_key_channel_handler_unittests.cc",
+      "keyboard_key_embedder_handler_unittests.cc",
+      "keyboard_key_handler_unittests.cc",
       "testing/mock_win32_window.cc",
       "testing/mock_win32_window.h",
       "testing/mock_window_binding_handler.cc",

shell/platform/windows/client_wrapper/BUILD.gn

@@ -18,7 +18,7 @@ _wrapper_sources = [
   "flutter_view_controller.cc",
 ]
 
-# This code will be merged into .../common/cpp/client_wrapper for client use,
+# This code will be merged into .../common/client_wrapper for client use,
 # so uses header paths that assume the merged state. Include the header
 # directories of the core wrapper files so these includes will work.
 config("relative_core_wrapper_headers") {