Support comma separated hardware keyboard layout.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2013 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/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 562 matching lines @@
 // static
 void GuestLanguageSetCallbackData::Callback(
     const scoped_ptr<GuestLanguageSetCallbackData>& self,
     const std::string& locale,
     const std::string& loaded_locale,
     bool success) {
   input_method::InputMethodManager* const ime_manager =
       input_method::InputMethodManager::Get();
   // Active layout must be hardware "login layout".
   // The previous one must be "locale default layout".
-  const std::string login_input_method =
-      ime_manager->GetInputMethodUtil()->GetHardwareLoginInputMethodId();
-  ime_manager->ChangeInputMethod(login_input_method);
+  std::vector<std::string> input_methods =

[Alexander Alekseev, 2014/02/12 14:45:35]

const vector<string>&

[Seigo Nonaka, 2014/02/12 16:49:51]

Done.

+      ime_manager->GetInputMethodUtil()->GetHardwareInputMethodIds();
+  for (size_t i = 0; i < input_methods.size(); ++i)
+    ime_manager->EnableInputMethod(input_methods[i]);
+  ime_manager->ChangeInputMethod(
+      input_methods.empty() ? "" : input_methods[0]);

[Alexander Alekseev, 2014/02/12 14:45:35]

You select first hardware input method which might be non-login for some reason.
Let's call GetHardwareLoginInputMethodIds() here and take the first one.

Also if GetHardwareLoginInputMethodIds() would return const reference to a
non-empty vector, it would be no-op.

[Seigo Nonaka, 2014/02/12 16:49:51]

If my understanding is correct, this function is called just after Guest user
login, right?
Do we need to restrict the active input method to login keyboard?

On 2014/02/12 14:45:35, alemate wrote:

[Alexander Alekseev, 2014/02/12 17:55:52]

Yes, this is called after guest session is started, so this method defines input
methods that would be allowed inside Guest session. That is why we enable all
hardware layouts.

See Kenji's comment #27 in crbug.com/329018.

[Seigo Nonaka, 2014/02/13 04:36:05]

Sure, done.

On 2014/02/12 17:55:52, alemate wrote:

 
   const std::string locale_default_input_method =
       ime_manager->GetInputMethodUtil()->
           GetLanguageDefaultInputMethodId(loaded_locale);
   if (!locale_default_input_method.empty()) {
     PrefService* user_prefs = self->profile->GetPrefs();
     user_prefs->SetString(prefs::kLanguagePreviousInputMethod,
                           locale_default_input_method);
   }
 }
@@ skipping 230 matching lines @@
   // Destroy DBus services immediately after threads are stopped.
   dbus_services_.reset();
 
   ChromeBrowserMainPartsLinux::PostDestroyThreads();
 
   // Destroy DeviceSettingsService after g_browser_process.
   DeviceSettingsService::Shutdown();
 }
 
 }  //  namespace chromeos