Rename chromeos::input_method::kLeftControl to chromeos::input_method::kControl.

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 199 matching lines @@
   for (size_t i = 0; i < language_prefs::kNumMozcIntegerPrefs; ++i) {
     prefs->RegisterIntegerPref(
         language_prefs::kMozcIntegerPrefs[i].pref_name,
         language_prefs::kMozcIntegerPrefs[i].default_pref_value,
         language_prefs::kMozcIntegerPrefs[i].sync_status);
   }
   prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapSearchKeyTo,
                              input_method::kSearchKey,
                              PrefService::SYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapControlKeyTo,
-                             input_method::kLeftControlKey,
+                             input_method::kControlKey,
                              PrefService::SYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapAltKeyTo,
-                             input_method::kLeftAltKey,
+                             input_method::kAltKey,
                              PrefService::SYNCABLE_PREF);
   // We don't sync the following keyboard prefs since they are not user-
   // configurable.
   prefs->RegisterBooleanPref(prefs::kLanguageXkbAutoRepeatEnabled,
                              true,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kLanguageXkbAutoRepeatDelay,
                              language_prefs::kXkbAutoRepeatDelayInMs,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kLanguageXkbAutoRepeatInterval,
@@ skipping 437 matching lines @@
       (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::kLeftControlKey,
+            input_method::kControlKey,
             input_method::ModifierKey(control_remap)));
     modifier_map.push_back(
         input_method::ModifierKeyPair(
-            input_method::kLeftAltKey,
+            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