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

chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.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/ui/webui/chromeos/keyboard_overlay_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/weak_ptr.h"
 #include "base/utf_string_conversions.h"
@@ skipping 29 matching lines @@
     "main.html?answer=188743";
 #else
     "http://support.google.com/chromeos/bin/answer.py?answer=183101";
 #endif
 
 struct ModifierToLabel {
   const ModifierKey modifier;
   const char* label;
 } kModifierToLabels[] = {
   {chromeos::input_method::kSearchKey, "search"},
-  {chromeos::input_method::kLeftControlKey, "ctrl"},
-  {chromeos::input_method::kLeftAltKey, "alt"},
+  {chromeos::input_method::kControlKey, "ctrl"},
+  {chromeos::input_method::kAltKey, "alt"},
   {chromeos::input_method::kVoidKey, "disabled"},
   {chromeos::input_method::kCapsLockKey, "caps lock"},
 };
 
 struct I18nContentToMessage {
   const char* i18n_content;
   int message;
 } kI18nContentToMessage[] = {
   { "keyboardOverlayLearnMore", IDS_KEYBOARD_OVERLAY_LEARN_MORE },
   { "keyboardOverlayTitle", IDS_KEYBOARD_OVERLAY_TITLE },
@@ skipping 219 matching lines @@
   web_ui()->CallJavascriptFunction("initKeyboardOverlayId", param);
 }
 
 void KeyboardOverlayHandler::GetLabelMap(const ListValue* args) {
   DCHECK(profile_);
   PrefService* pref_service = profile_->GetPrefs();
   typedef std::map<ModifierKey, ModifierKey> ModifierMap;
   ModifierMap modifier_map;
   modifier_map[chromeos::input_method::kSearchKey] = static_cast<ModifierKey>(
       pref_service->GetInteger(prefs::kLanguageXkbRemapSearchKeyTo));
-  modifier_map[chromeos::input_method::kLeftControlKey] =
-      static_cast<ModifierKey>(
-          pref_service->GetInteger(prefs::kLanguageXkbRemapControlKeyTo));
-  modifier_map[chromeos::input_method::kLeftAltKey] = static_cast<ModifierKey>(
+  modifier_map[chromeos::input_method::kControlKey] = static_cast<ModifierKey>(
+      pref_service->GetInteger(prefs::kLanguageXkbRemapControlKeyTo));
+  modifier_map[chromeos::input_method::kAltKey] = static_cast<ModifierKey>(
       pref_service->GetInteger(prefs::kLanguageXkbRemapAltKeyTo));
 
   DictionaryValue dict;
   for (ModifierMap::const_iterator i = modifier_map.begin();
        i != modifier_map.end(); ++i) {
     dict.SetString(ModifierKeyToLabel(i->first), ModifierKeyToLabel(i->second));
   }
 
   web_ui()->CallJavascriptFunction("initIdentifierMap", dict);
 }
@@ skipping 14 matching lines @@
 KeyboardOverlayUI::KeyboardOverlayUI(content::WebUI* web_ui)
     : WebDialogUI(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
   KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile);
   web_ui->AddMessageHandler(handler);
 
   // Set up the chrome://keyboardoverlay/ source.
   ChromeURLDataManager::AddDataSource(profile,
       CreateKeyboardOverlayUIHTMLSource());
 }