Implement the "Configure modifier keys" drop-down

chrome/browser/chromeos/preferences.cc

 // Copyright (c) 2009 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/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/keyboard_library.h"
 #include "chrome/browser/chromeos/cros/input_method_library.h"
 #include "chrome/browser/chromeos/cros/synaptics_library.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/pref_member.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "unicode/timezone.h"
 
 namespace chromeos {
@@ skipping 55 matching lines @@
   }
   for (size_t i = 0; i < kNumMozcMultipleChoicePrefs; ++i) {
     prefs->RegisterStringPref(
         kMozcMultipleChoicePrefs[i].pref_name,
         kMozcMultipleChoicePrefs[i].default_pref_value);
   }
   for (size_t i = 0; i < kNumMozcIntegerPrefs; ++i) {
     prefs->RegisterIntegerPref(kMozcIntegerPrefs[i].pref_name,
                                kMozcIntegerPrefs[i].default_pref_value);
   }
+  prefs->RegisterIntegerPref(
+      kXkbModifierMultipleChoicePrefs.pref_name,
+      kXkbModifierMultipleChoicePrefs.default_pref_value);
 }
 
 void Preferences::Init(PrefService* prefs) {
   tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, this);
   accessibility_enabled_.Init(prefs::kAccessibilityEnabled, prefs, this);
   vert_edge_scroll_enabled_.Init(prefs::kVertEdgeScrollEnabled, prefs, this);
   speed_factor_.Init(prefs::kTouchpadSpeedFactor, prefs, this);
   sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, this);
   language_hotkey_next_engine_in_menu_.Init(
       prefs::kLanguageHotkeyNextEngineInMenu, prefs, this);
@@ skipping 34 matching lines @@
         kMozcBooleanPrefs[i].pref_name, prefs, this);
   }
   for (size_t i = 0; i < kNumMozcMultipleChoicePrefs; ++i) {
     language_mozc_multiple_choice_prefs_[i].Init(
         kMozcMultipleChoicePrefs[i].pref_name, prefs, this);
   }
   for (size_t i = 0; i < kNumMozcIntegerPrefs; ++i) {
     language_mozc_integer_prefs_[i].Init(
         kMozcIntegerPrefs[i].pref_name, prefs, this);
   }
+  language_xkb_modifier_remap_.Init(
+      kXkbModifierMultipleChoicePrefs.pref_name, prefs, this);
 
   std::string locale(g_browser_process->GetApplicationLocale());
   // Add input methods based on the application locale when the user first
   // logs in. For instance, if the user chooses Japanese as the UI
   // language at the first login, we'll add input methods associated with
   // Japanese, such as mozc.
   if (locale != kFallbackInputMethodLocale &&
       !prefs->HasPrefPath(prefs::kLanguagePreloadEngines)) {
     std::string preload_engines(language_preload_engines_.GetValue());
     std::vector<std::string> input_method_ids;
@@ skipping 139 matching lines @@
           language_mozc_multiple_choice_prefs_[i].GetValue());
     }
   }
   for (size_t i = 0; i < kNumMozcIntegerPrefs; ++i) {
     if (!pref_name || *pref_name == kMozcIntegerPrefs[i].pref_name) {
       SetLanguageConfigInteger(kMozcSectionName,
                                kMozcIntegerPrefs[i].ibus_config_name,
                                language_mozc_integer_prefs_[i].GetValue());
     }
   }
+  if (!pref_name || *pref_name == kXkbModifierMultipleChoicePrefs.pref_name) {
+    chromeos::ModifierMap modifier_map;
+    const int remap_type = language_xkb_modifier_remap_.GetValue();
+    switch (remap_type) {
+      default:
+        LOG(ERROR) << "Unknown XKB remapping type: " << remap_type;
+        /* fall through */
+      case kNoRemap:
+        modifier_map.push_back(ModifierKeyPair(kSearchKey, kSearchKey));
+        modifier_map.push_back(
+            ModifierKeyPair(kLeftControlKey, kLeftControlKey));
+        modifier_map.push_back(ModifierKeyPair(kLeftAltKey, kLeftAltKey));
+        break;
+      case kSwapCtrlAndAlt:
+        modifier_map.push_back(ModifierKeyPair(kSearchKey, kSearchKey));
+        modifier_map.push_back(ModifierKeyPair(kLeftControlKey, kLeftAltKey));
+        modifier_map.push_back(ModifierKeyPair(kLeftAltKey, kLeftControlKey));
+        break;
+      case kSwapSearchAndCtrl:
+        modifier_map.push_back(ModifierKeyPair(kSearchKey, kLeftControlKey));
+        modifier_map.push_back(ModifierKeyPair(kLeftControlKey, kSearchKey));
+        modifier_map.push_back(ModifierKeyPair(kLeftAltKey, kLeftAltKey));
+        break;
+    }
+    CrosLibrary::Get()->GetKeyboardLibrary()->RemapModifierKeys(modifier_map);
+  }
 }
 
 void Preferences::SetLanguageConfigBoolean(const char* section,
                                            const char* name,
                                            bool value) {
   ImeConfigValue config;
   config.type = ImeConfigValue::kValueTypeBool;
   config.bool_value = value;
   CrosLibrary::Get()->GetInputMethodLibrary()->
       SetImeConfig(section, name, config);
@@ skipping 40 matching lines @@
   std::vector<std::string> split_values;
   if (!value.empty())
     SplitString(value, ',', &split_values);
 
   // We should call the cros API even when |value| is empty, to disable default
   // config.
   SetLanguageConfigStringList(section, name, split_values);
 }
 
 }  // namespace chromeos