Support comma separated hardware keyboard layout.

chrome/browser/chromeos/input_method/input_method_delegate_impl.cc

Index: chrome/browser/chromeos/input_method/input_method_delegate_impl.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc b/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc
index ddfbe69dea6b4f17f41d8981ef514b9847453d28..aee6783315a404467776ef53ce56f327def89ea2 100644
--- a/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc
+++ b/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
+#include "base/strings/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/pref_names.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -13,17 +14,21 @@
 namespace chromeos {
 namespace input_method {
 
-InputMethodDelegateImpl::InputMethodDelegateImpl() {}
-
-std::string InputMethodDelegateImpl::GetHardwareKeyboardLayout() const {
-  if (g_browser_process) {
-    PrefService* local_state = g_browser_process->local_state();
-    if (local_state)
-      return local_state->GetString(prefs::kHardwareKeyboardLayout);
-  }
-  // This shouldn't happen but just in case.
-  DVLOG(1) << "Local state is not yet ready.";
-  return std::string();
+InputMethodDelegateImpl::InputMethodDelegateImpl() {
+}
+
+InputMethodDelegateImpl::~InputMethodDelegateImpl() {
+}
+
+std::string InputMethodDelegateImpl::GetHardwareKeyboardLayouts() const {
+  if (!g_browser_process)
+    return "";
+
+  PrefService* local_state = g_browser_process->local_state();
+  if (!local_state)
+    return "";
+
+  return local_state->GetString(prefs::kHardwareKeyboardLayout);
 }
 
 base::string16 InputMethodDelegateImpl::GetLocalizedString(
@@ -40,5 +45,11 @@ base::string16 InputMethodDelegateImpl::GetDisplayLanguageName(
       true);
 }
 
+void InputMethodDelegateImpl::SetHardwareKeyboardLayoutForTesting(
+    const std::string& layout) {
+  NOTREACHED() << "Use FakeInputMethodDelegate for hardware keyboard layout "
+               << "testing purpose.";
+}
+
 }  // namespace input_method
 }  // namespace chromeos