Remove virtual keyboard support from input_method_descriptor.h.

chrome/browser/chromeos/input_method/input_method_descriptor.cc

Index: chrome/browser/chromeos/input_method/input_method_descriptor.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_descriptor.cc b/chrome/browser/chromeos/input_method/input_method_descriptor.cc
index 4a2a91ac0ceefc40cd162d8e1e49b77cd6bba3fa..a0e03d458058e7a9b4e7a658dec3f4df189f26ea 100644
--- a/chrome/browser/chromeos/input_method/input_method_descriptor.cc
+++ b/chrome/browser/chromeos/input_method/input_method_descriptor.cc
@@ -8,9 +8,6 @@
 
 #include "base/logging.h"
 #include "base/string_split.h"
-#include "chrome/browser/chromeos/input_method/input_method_whitelist.h"
-
-// TODO(yusukes): Remove virtual keyboard support.
 
 namespace chromeos {
 namespace input_method {
@@ -19,28 +16,14 @@ namespace {
 const char kFallbackLayout[] = "us";
 }  // namespace
 
-InputMethodDescriptor::InputMethodDescriptor(
-    const InputMethodWhitelist& whitelist,
-    const std::string& id,
-    const std::string& name,
-    const std::string& raw_layout,
-    const std::string& language_code)
+InputMethodDescriptor::InputMethodDescriptor(const std::string& id,
+                                             const std::string& name,
+                                             const std::string& keyboard_layout,
+                                             const std::string& language_code)
     : id_(id),
       name_(name),
+      keyboard_layout_(keyboard_layout),
       language_code_(language_code) {
-  keyboard_layout_ = kFallbackLayout;
-  base::SplitString(raw_layout, ',', &virtual_keyboard_layouts_);
-
-  // Find a valid XKB layout name from the comma-separated list, |raw_layout|.
-  // Only the first acceptable XKB layout name in the list is used as the
-  // |keyboard_layout| value of the InputMethodDescriptor object to be created
-  for (size_t i = 0; i < virtual_keyboard_layouts_.size(); ++i) {
-    if (whitelist.XkbLayoutIsSupported(virtual_keyboard_layouts_[i])) {
-      keyboard_layout_ = virtual_keyboard_layouts_[i];
-      DCHECK(keyboard_layout_.find(",") == std::string::npos);
-      break;
-    }
-  }
 }
 
 InputMethodDescriptor::InputMethodDescriptor() {
@@ -49,21 +32,6 @@ InputMethodDescriptor::InputMethodDescriptor() {
 InputMethodDescriptor::~InputMethodDescriptor() {
 }
 
-InputMethodDescriptor::InputMethodDescriptor(
-    const std::string& in_id,
-    const std::string& in_name,
-    const std::string& in_keyboard_layout,
-    const std::string& in_virtual_keyboard_layouts,
-    const std::string& in_language_code)
-    : id_(in_id),
-      name_(in_name),
-      keyboard_layout_(in_keyboard_layout),
-      language_code_(in_language_code) {
-  DCHECK(keyboard_layout_.find(",") == std::string::npos);
-  base::SplitString(
-      in_virtual_keyboard_layouts, ',', &virtual_keyboard_layouts_);
-}
-
 bool InputMethodDescriptor::operator==(
     const InputMethodDescriptor& other) const {
   return id() == other.id();
@@ -80,7 +48,6 @@ InputMethodDescriptor::GetFallbackInputMethodDescriptor() {
   return InputMethodDescriptor("xkb:us::eng",
                                "",
                                kFallbackLayout,
-                               kFallbackLayout,
                                "en-US");
 }
 
@@ -89,7 +56,6 @@ std::string InputMethodDescriptor::ToString() const {
   stream << "id=" << id()
          << ", name=" << name()
          << ", keyboard_layout=" << keyboard_layout()
-         << ", virtual_keyboard_layouts=" << virtual_keyboard_layouts_.size()
          << ", language_code=" << language_code();
   return stream.str();
 }