1 files changed, 2 insertions, 8 deletions
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index e22452a..3469ca2 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -174,15 +174,9 @@ ChromotingInstance::ChromotingInstance(PP_Instance pp_instance)
       plugin_task_runner_(new PluginThreadTaskRunner(&plugin_thread_delegate_)),
       context_(plugin_task_runner_.get()),
       input_tracker_(&mouse_input_filter_),
-#if defined(OS_MACOSX)
-      // On Mac we need an extra filter to inject missing keyup events.
-      // See remoting/client/plugin/mac_key_event_processor.h for more details.
-      mac_key_event_processor_(&input_tracker_),
-      key_mapper_(&mac_key_event_processor_),
-#else
       key_mapper_(&input_tracker_),
-#endif
-      input_handler_(&key_mapper_),
+      normalizing_input_filter_(CreateNormalizingInputFilter(&key_mapper_)),
+      input_handler_(normalizing_input_filter_.get()),
       use_async_pin_dialog_(false),
       weak_factory_(this) {
   RequestInputEvents(PP_INPUTEVENT_CLASS_MOUSE | PP_INPUTEVENT_CLASS_WHEEL);