Stop using "+chromeos(...)" in an XKB layout name.

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 23 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";
 
 // A string for obtaining a mask value for Num Lock.
 const char kNumLockVirtualModifierString[] = "NumLock";
 
+// Returns false if |layout_name| contains a bad character.
+bool CheckLayoutName(const std::string& layout_name) {
+  static const char kValidLayoutNameCharacters[] =
+      "abcdefghijklmnopqrstuvwxyz0123456789()-_";
+
+  if (layout_name.empty()) {
+    DVLOG(1) << "Invalid layout_name: " << layout_name;
+    return false;
+  }
+
+  if (layout_name.find_first_not_of(kValidLayoutNameCharacters) !=
+      std::string::npos) {
+    DVLOG(1) << "Invalid layout_name: " << layout_name;
+    return false;
+  }
+
+  return true;
+}
+
 class XKeyboardImpl : public XKeyboard {
  public:
   explicit XKeyboardImpl(const InputMethodUtil& util);
   virtual ~XKeyboardImpl() {}
 
   // Overridden from XKeyboard:
   virtual bool SetCurrentKeyboardLayoutByName(
       const std::string& layout_name) OVERRIDE;
   virtual bool ReapplyCurrentKeyboardLayout() OVERRIDE;
   virtual void ReapplyCurrentModifierLockStatus() OVERRIDE;
   virtual void SetLockedModifiers(
       ModifierLockStatus new_caps_lock_status,
       ModifierLockStatus new_num_lock_status) OVERRIDE;
   virtual void SetNumLockEnabled(bool enable_num_lock) OVERRIDE;
   virtual void SetCapsLockEnabled(bool enable_caps_lock) OVERRIDE;
   virtual bool NumLockIsEnabled() OVERRIDE;
   virtual bool CapsLockIsEnabled() OVERRIDE;
   virtual unsigned int GetNumLockMask() OVERRIDE;
   virtual void GetLockedModifiers(bool* out_caps_lock_enabled,
                                   bool* out_num_lock_enabled) OVERRIDE;
-  virtual std::string CreateFullXkbLayoutName(
-      const std::string& layout_name) OVERRIDE;
 
  private:
   // This function is used by SetLayout() and RemapModifierKeys(). Calls
   // setxkbmap command if needed, and updates the last_full_layout_name_ cache.
   bool SetLayoutInternal(const std::string& layout_name, bool force);
 
   // Executes 'setxkbmap -layout ...' command asynchronously using a layout name
   // in the |execute_queue_|. Do nothing if the queue is empty.
   // TODO(yusukes): Use libxkbfile.so instead of the command (crosbug.com/13105)
   void MaybeExecuteSetLayoutCommand();
@@ skipping 33 matching lines @@
 }
 
 bool XKeyboardImpl::SetLayoutInternal(const std::string& layout_name,
                                       bool force) {
   if (!is_running_on_chrome_os_) {
     // We should not try to change a layout on Linux or inside ui_tests. Just
     // return true.
     return true;
   }
 
-  const std::string layout_to_set = CreateFullXkbLayoutName(layout_name);
-  if (layout_to_set.empty())
+  if (!CheckLayoutName(layout_name))
     return false;
 
-  if (!current_layout_name_.empty()) {
-    const std::string current_layout = CreateFullXkbLayoutName(
-        current_layout_name_);
-    if (!force && (current_layout == layout_to_set)) {
-      DVLOG(1) << "The requested layout is already set: " << layout_to_set;
-      return true;
-    }
+  if (!force && (current_layout_name_ == layout_name)) {
+    DVLOG(1) << "The requested layout is already set: " << layout_name;
+    return true;
   }
 
-  DVLOG(1) << (force ? "Reapply" : "Set") << " layout: " << layout_to_set;
+  DVLOG(1) << (force ? "Reapply" : "Set") << " layout: " << layout_name;
 
   const bool start_execution = execute_queue_.empty();
   // If no setxkbmap command is in flight (i.e. start_execution is true),
   // start the first one by explicitly calling MaybeExecuteSetLayoutCommand().
   // If one or more setxkbmap commands are already in flight, just push the
   // layout name to the queue. setxkbmap command for the layout will be called
   // via OnSetLayoutFinish() callback later.
-  execute_queue_.push(layout_to_set);
+  execute_queue_.push(layout_name);
   if (start_execution)
     MaybeExecuteSetLayoutCommand();
 
   return true;
 }
 
 // Executes 'setxkbmap -layout ...' command asynchronously using a layout name
 // in the |execute_queue_|. Do nothing if the queue is empty.
 // TODO(yusukes): Use libxkbfile.so instead of the command (crosbug.com/13105)
 void XKeyboardImpl::MaybeExecuteSetLayoutCommand() {
@@ skipping 81 matching lines @@
   }
 
   XkbStateRec status;
   XkbGetState(ui::GetXDisplay(), XkbUseCoreKbd, &status);
   if (out_caps_lock_enabled)
     *out_caps_lock_enabled = status.locked_mods & LockMask;
   if (out_num_lock_enabled)
     *out_num_lock_enabled = status.locked_mods & num_lock_mask_;
 }
 
-std::string XKeyboardImpl::CreateFullXkbLayoutName(
-    const std::string& layout_name) {
-  static const char kValidLayoutNameCharacters[] =
-      "abcdefghijklmnopqrstuvwxyz0123456789()-_";
-
-  if (layout_name.empty()) {
-    DVLOG(1) << "Invalid layout_name: " << layout_name;
-    return "";
-  }
-
-  if (layout_name.find_first_not_of(kValidLayoutNameCharacters) !=
-      std::string::npos) {
-    DVLOG(1) << "Invalid layout_name: " << layout_name;
-    return "";
-  }
-
-  // TODO(yusukes): Remove "+chromeos(...)".
-  std::string full_xkb_layout_name =
-      base::StringPrintf("%s+chromeos(search_leftcontrol_leftalt_keepralt)",
-                         layout_name.c_str());
-
-  return full_xkb_layout_name;
-}
-
 void XKeyboardImpl::SetLockedModifiers(ModifierLockStatus new_caps_lock_status,
                                        ModifierLockStatus new_num_lock_status) {
   CHECK(CurrentlyOnUIThread());
   if (!num_lock_mask_) {
     DVLOG(1) << "Cannot set locked modifiers. Num Lock mask unknown.";
     return;
   }
 
   unsigned int affect_mask = 0;
   unsigned int value_mask = 0;
@@ skipping 107 matching lines @@
 }
 
 // static
 bool XKeyboard::GetAutoRepeatRateForTesting(AutoRepeatRate* out_rate) {
   return XkbGetAutoRepeatRate(ui::GetXDisplay(), XkbUseCoreKbd,
                               &(out_rate->initial_delay_in_ms),
                               &(out_rate->repeat_interval_in_ms)) == True;
 }
 
 // static
+bool XKeyboard::CheckLayoutNameForTesting(const std::string& layout_name) {
+  return CheckLayoutName(layout_name);
+}
+
+// static
 XKeyboard* XKeyboard::Create(const InputMethodUtil& util) {
   return new XKeyboardImpl(util);
 }
 
 }  // namespace input_method
 }  // namespace chromeos