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

chrome/browser/chromeos/input_method/xkeyboard.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/input_method/xkeyboard.h"
 
 #include <cstdlib>
 #include <cstring>
 #include <queue>
 #include <set>
@@ skipping 24 matching lines @@
 // The default keyboard layout name in the xorg config file.
 const char kDefaultLayoutName[] = "us";
 
 // The command we use to set the current XKB layout and modifier key mapping.
 // TODO(yusukes): Use libxkbfile.so instead of the command (crosbug.com/13105)
 const char kSetxkbmapCommand[] = "/usr/bin/setxkbmap";
 
 // See the comment at ModifierKey in the .h file.
 ModifierKey kCustomizableKeys[] = {
   kSearchKey,
-  kLeftControlKey,
-  kLeftAltKey
+  kControlKey,
+  kAltKey
 };
 
 // A string for obtaining a mask value for Num Lock.
 const char kNumLockVirtualModifierString[] = "NumLock";
 
 class XKeyboardImpl : public XKeyboard {
  public:
   explicit XKeyboardImpl(const InputMethodUtil& util);
   virtual ~XKeyboardImpl() {}
 
@@ skipping 261 matching lines @@
   std::string use_search_key_as_str;
   std::string use_left_control_key_as_str;
   std::string use_left_alt_key_as_str;
 
   for (size_t i = 0; i < modifier_map.size(); ++i) {
     std::string* target = NULL;
     switch (modifier_map[i].original) {
       case kSearchKey:
         target = &use_search_key_as_str;
         break;
-      case kLeftControlKey:
+      case kControlKey:
         target = &use_left_control_key_as_str;
         break;
-      case kLeftAltKey:
+      case kAltKey:
         target = &use_left_alt_key_as_str;
         break;
       default:
         break;
     }
     if (!target) {
       DVLOG(1) << "We don't support remaping "
                << ModifierKeyToString(modifier_map[i].original);
       return "";
     }
@@ skipping 116 matching lines @@
     return true;
   }
   return BrowserThread::CurrentlyOn(BrowserThread::UI);
 }
 
 // static
 std::string XKeyboardImpl::ModifierKeyToString(ModifierKey key) {
   switch (key) {
     case kSearchKey:
       return "search";
-    case kLeftControlKey:
+    case kControlKey:
       return "leftcontrol";
-    case kLeftAltKey:
+    case kAltKey:
       return "leftalt";
     case kVoidKey:
       return "disabled";
     case kCapsLockKey:
       return "capslock";
     case kNumModifierKeys:
       break;
   }
   return "";
 }
@@ skipping 68 matching lines @@
   return false;
 }
 
 // static
 XKeyboard* XKeyboard::Create(const InputMethodUtil& util) {
   return new XKeyboardImpl(util);
 }
 
 }  // namespace input_method
 }  // namespace chromeos