Move modifier remapping code from X to Ash

chrome/browser/chromeos/input_method/xkeyboard.h

Index: chrome/browser/chromeos/input_method/xkeyboard.h
diff --git a/chrome/browser/chromeos/input_method/xkeyboard.h b/chrome/browser/chromeos/input_method/xkeyboard.h
index 7e085e21f4afe0f7fc29b89d5c0498e5d90d6ed2..148cea815ac5f7f027c192e0054b7e81a9424e37 100644
--- a/chrome/browser/chromeos/input_method/xkeyboard.h
+++ b/chrome/browser/chromeos/input_method/xkeyboard.h
@@ -26,7 +26,6 @@ enum ModifierLockStatus {
   kDontChange,
 };
 
-// TODO(yusukes): Remove this enum when crbug.com/115112 is implemented.
 enum ModifierKey {
   kSearchKey = 0,  // Customizable.
   kControlKey,  // Customizable.
@@ -38,19 +37,6 @@ enum ModifierKey {
   kNumModifierKeys,
 };
 
-// TODO(yusukes): Remove this struct when crbug.com/115112 is implemented.
-struct ModifierKeyPair {
-  ModifierKeyPair(ModifierKey in_original, ModifierKey in_replacement)
-      : original(in_original), replacement(in_replacement) {}
-  bool operator==(const ModifierKeyPair& rhs) const {
-    // For CheckMap() in chromeos_keyboard_unittest.cc.
-    return (rhs.original == original) && (rhs.replacement == replacement);
-  }
-  ModifierKey original;      // Replace the key with
-  ModifierKey replacement;   // this key.
-};
-typedef std::vector<ModifierKeyPair> ModifierMap;
-
 class InputMethodUtil;
 
 class XKeyboard {
@@ -62,12 +48,6 @@ class XKeyboard {
   virtual bool SetCurrentKeyboardLayoutByName(
       const std::string& layout_name) = 0;
 
-  // Remaps modifier keys. This function does not change the current keyboard
-  // layout. Returns true on success. For now, you can't remap Left Control and
-  // Left Alt keys to caps lock.
-  // TODO(yusukes): Remove this method when crbug.com/115112 is implemented.
-  virtual bool RemapModifierKeys(const ModifierMap& modifier_map) = 0;
-
   // Sets the current keyboard layout again. We have to call the function every
   // time when "XI_HierarchyChanged" XInput2 event is sent to Chrome. See
   // xinput_hierarchy_changed_event_listener.h for details.
@@ -112,8 +92,7 @@ class XKeyboard {
   // directly: it is public for testability.
   // TODO(yusukes): Remove this method from the interface class.
   virtual std::string CreateFullXkbLayoutName(
-      const std::string& layout_name,
-      const ModifierMap& modifire_map) = 0;
+      const std::string& layout_name) = 0;
 
   // Returns a mask (e.g. 1U<<4) for Num Lock. On error, returns 0. Do not call
   // the function from non-UI threads.
@@ -147,11 +126,6 @@ class XKeyboard {
   // Returns false otherwise. This function is protected: for testability.
   static bool GetAutoRepeatRateForTesting(AutoRepeatRate* out_rate);
 
-  // Returns true if |key| is in |modifier_map| as replacement. Do not call this
-  // function directly: it is public for testability.
-  static bool ContainsModifierKeyAsReplacement(const ModifierMap& modifier_map,
-                                               ModifierKey key);
-
   // Note: At this moment, classes other than InputMethodManager should not
   // instantiate the XKeyboard class.
   static XKeyboard* Create(const InputMethodUtil& util);