Merge https://codereview.chromium.org/1920033003.

remoting/client/plugin/pepper_input_handler.cc

 // Copyright (c) 2012 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 "remoting/client/plugin/pepper_input_handler.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "ppapi/cpp/image_data.h"
@@ skipping 69 matching lines @@
   if (modifiers & PP_INPUTEVENT_MODIFIER_NUMLOCKKEY)
     lock_states |= protocol::KeyEvent::LOCK_STATES_NUMLOCK;
 
   return lock_states;
 }
 
 // Builds a protocol::KeyEvent from the supplied PPAPI event.
 protocol::KeyEvent MakeKeyEvent(const pp::KeyboardInputEvent& pp_key_event) {
   protocol::KeyEvent key_event;
   std::string dom_code = pp_key_event.GetCode().AsString();
+  // Chrome M52 changed the string representation of the left and right OS
+  // keys, which means that if the client plugin is compiled against a
+  // different version of the mapping table, the lookup will fail. The long-
+  // term solution is to use JavaScript input events, but for now just check
+  // explicitly for the new names and convert them to the old ones (because
+  // this code is compiled against the old table in the M51 branch).
+  if (dom_code == "MetaLeft") {
+    dom_code = "OSLeft";
+  } else if (dom_code == "MetaRight") {
+    dom_code = "OSRight";
+  }
   key_event.set_usb_keycode(ui::KeycodeConverter::CodeToUsbKeycode(dom_code));
   key_event.set_pressed(pp_key_event.GetType() == PP_INPUTEVENT_TYPE_KEYDOWN);
   key_event.set_lock_states(MakeLockStates(pp_key_event));
   return key_event;
 }
 
 // Builds a protocol::MouseEvent from the supplied PPAPI event.
 protocol::MouseEvent MakeMouseEvent(const pp::MouseInputEvent& pp_mouse_event,
                                     bool set_deltas) {
   protocol::MouseEvent mouse_event;
@@ skipping 176 matching lines @@
       input_tracker_->ReleaseAllIfModifiersStuck(
           (modifiers & PP_INPUTEVENT_MODIFIER_ALTKEY) != 0,
           (modifiers & PP_INPUTEVENT_MODIFIER_CONTROLKEY) != 0,
           (modifiers & PP_INPUTEVENT_MODIFIER_METAKEY) != 0,
           (modifiers & PP_INPUTEVENT_MODIFIER_SHIFTKEY) != 0);
     }
   }
 }
 
 }  // namespace remoting