Move modifier remapping code from X to Ash

chrome/browser/chromeos/preferences.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 "chrome/browser/chromeos/preferences.h"
 
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
 #include "base/metrics/histogram.h"
@@ skipping 313 matching lines @@
         language_prefs::kMozcBooleanPrefs[i].pref_name, prefs, this);
   }
   for (size_t i = 0; i < language_prefs::kNumMozcMultipleChoicePrefs; ++i) {
     mozc_multiple_choice_prefs_[i].Init(
         language_prefs::kMozcMultipleChoicePrefs[i].pref_name, prefs, this);
   }
   for (size_t i = 0; i < language_prefs::kNumMozcIntegerPrefs; ++i) {
     mozc_integer_prefs_[i].Init(
         language_prefs::kMozcIntegerPrefs[i].pref_name, prefs, this);
   }
-  xkb_remap_search_key_to_.Init(
-      prefs::kLanguageXkbRemapSearchKeyTo, prefs, this);
-  xkb_remap_control_key_to_.Init(
-      prefs::kLanguageXkbRemapControlKeyTo, prefs, this);
-  xkb_remap_alt_key_to_.Init(
-      prefs::kLanguageXkbRemapAltKeyTo, prefs, this);
   xkb_auto_repeat_enabled_.Init(
       prefs::kLanguageXkbAutoRepeatEnabled, prefs, this);
   xkb_auto_repeat_delay_pref_.Init(
       prefs::kLanguageXkbAutoRepeatDelay, prefs, this);
   xkb_auto_repeat_interval_pref_.Init(
       prefs::kLanguageXkbAutoRepeatInterval, prefs, this);
 
   enable_screen_lock_.Init(prefs::kEnableScreenLock, prefs, this);
 
   enable_drm_.Init(prefs::kEnableCrosDRM, prefs, this);
@@ skipping 81 matching lines @@
       UMA_HISTOGRAM_BOOLEAN("Mouse.PrimaryButtonRight.Changed", right);
     else
       UMA_HISTOGRAM_BOOLEAN("Mouse.PrimaryButtonRight.Started", right);
   }
 
   if (!pref_name || *pref_name == prefs::kLanguagePreferredLanguages) {
     // Unlike kLanguagePreloadEngines and some other input method
     // preferencs, we don't need to send this to ibus-daemon.
   }
 
-  // Here, we set up the the modifier key mapping. This has to be done
-  // before changing the current keyboard layout, so that the modifier key
-  // preference is properly preserved. For this reason, we should do this
-  // before setting preload engines, that could change the current
-  // keyboard layout as needed.
-  if (!pref_name || (*pref_name == prefs::kLanguageXkbRemapSearchKeyTo ||
-                     *pref_name == prefs::kLanguageXkbRemapControlKeyTo ||
-                     *pref_name == prefs::kLanguageXkbRemapAltKeyTo)) {
-    UpdateModifierKeyMapping();
-  }
   if (!pref_name || *pref_name == prefs::kLanguageXkbAutoRepeatEnabled) {
     const bool enabled = xkb_auto_repeat_enabled_.GetValue();
     input_method::XKeyboard::SetAutoRepeatEnabled(enabled);
   }
   if (!pref_name || ((*pref_name == prefs::kLanguageXkbAutoRepeatDelay) ||
                      (*pref_name == prefs::kLanguageXkbAutoRepeatInterval))) {
     UpdateAutoRepeatRate();
   }
 
   if (!pref_name) {
@@ skipping 195 matching lines @@
   // might be ignored as an invalid input method ID. The ChangeInputMethod()
   // calls are also necessary to restore the previous/current input method prefs
   // which could have been modified by the SetLanguageConfigStringListAsCSV call
   // above to the original state.
   if (!previous_input_method_id.empty())
     input_method_manager_->ChangeInputMethod(previous_input_method_id);
   if (!current_input_method_id.empty())
     input_method_manager_->ChangeInputMethod(current_input_method_id);
 }
 
-void Preferences::UpdateModifierKeyMapping() {
-  const int search_remap = xkb_remap_search_key_to_.GetValue();
-  const int control_remap = xkb_remap_control_key_to_.GetValue();
-  const int alt_remap = xkb_remap_alt_key_to_.GetValue();
-  if ((search_remap < input_method::kNumModifierKeys) && (search_remap >= 0) &&
-      (control_remap < input_method::kNumModifierKeys) &&
-      (control_remap >= 0) &&
-      (alt_remap < input_method::kNumModifierKeys) && (alt_remap >= 0)) {
-    input_method::ModifierMap modifier_map;
-    modifier_map.push_back(
-        input_method::ModifierKeyPair(
-            input_method::kSearchKey,
-            input_method::ModifierKey(search_remap)));
-    modifier_map.push_back(
-        input_method::ModifierKeyPair(
-            input_method::kControlKey,
-            input_method::ModifierKey(control_remap)));
-    modifier_map.push_back(
-        input_method::ModifierKeyPair(
-            input_method::kAltKey,
-            input_method::ModifierKey(alt_remap)));
-    input_method_manager_->GetXKeyboard()->RemapModifierKeys(modifier_map);
-  } else {
-    LOG(ERROR) << "Failed to remap modifier keys. Unexpected value(s): "
-               << search_remap << ", " << control_remap << ", " << alt_remap;
-  }
-}
-
 void Preferences::UpdateAutoRepeatRate() {
   // Avoid setting repeat rate on desktop dev environment.
   if (!base::chromeos::IsRunningOnChromeOS())
     return;
 
   input_method::AutoRepeatRate rate;
   rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue();
   rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue();
   DCHECK(rate.initial_delay_in_ms > 0);
   DCHECK(rate.repeat_interval_in_ms > 0);
   input_method::XKeyboard::SetAutoRepeatRate(rate);
 }
 
 }  // namespace chromeos