Add language and keyboard layout pickers to public session pods

chrome/browser/ui/webui/chromeos/login/l10n_util.cc

 // Copyright 2014 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/ui/webui/chromeos/login/l10n_util.h"
 
 #include <set>
 #include <utility>
 
 #include "base/basictypes.h"
@@ skipping 149 matching lines @@
     if (!optgroup_added) {
       optgroup_added = true;
       AddOptgroupOtherLayouts(input_methods_list.get());
     }
     input_methods_list->Append(CreateInputMethodsEntry(*us_eng_descriptor,
                                                        selected));
   }
   return input_methods_list.Pass();
 }
 
+scoped_ptr<base::ListValue> GetKeyboardLayouts(const std::string& locale) {

[Alexander Alekseev, 2014/07/16 19:35:50]

We have similar code for the Guest session:

https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/chr...

So, for the guest session we explicitly enable all hardware layouts plus locale
layouts.

Don't you think it is reasonable to enable all hardware layouts?

Also, I don't know if we have domain policy with default layout.
But if there is one, should we explicitly enable it and make default? (This
would be different against Guest session, because it is
owner/policy-independent.)

[bartfab (slow), 2014/07/21 14:49:13]

The difference is that the code we have for guest actually enables layouts. I do
not want to enable any layouts - I just want to enumerate them. I only want to
obtain a list that I can show in the UI. This way, if the user clicks away from
the public session pod without starting a session, the l10n settings will be
unaffected by the choices made in the pod.
My work is all about adding a new policy to set the default layout. I just broke
it into several smaller CLs. This one adds a language picker that simply
defaults to the first language in the list. A follow-up CL will wire it up to
the policy.

[Alexander Alekseev, 2014/07/21 17:06:56]

Ah, I see what you are doing. Thank you for explanation.

[Alexander Alekseev, 2014/07/21 17:13:41]

GetKeyboardLayouts() seems to be too general. We already have a lot of
"Get*KeyboardLayouts" and most of them (now) have descriptive names. And
everyone working on input methods make mistakes using not yet renamed
"GetKeyboardLayouts" .

Maybe rename to GetPublicSessionKeyboardLayouts() ?

[bartfab (slow), 2014/07/21 18:20:47]

I called it GetKeyboardLayoutsForLocale(). After all, it returns all layouts for
the given locale plus all hardware layouts. This seems fairly generic and useful
outside public sessions.

+  input_method::InputMethodUtil* util =
+      input_method::InputMethodManager::Get()->GetInputMethodUtil();
+  std::vector<std::string> layouts = util->GetHardwareLoginInputMethodIds();

[Alexander Alekseev, 2014/07/21 17:06:56]

May be GetHardwareInputMethodIds ? (not "Login")
User doesn't need to immediately input login information, so it would be strange
if he couldn't select any hardware layout. What do you think?

[bartfab (slow), 2014/07/21 18:20:47]

Nice catch. Done.

+  std::vector<std::string> layouts_from_locale;
+  util->GetInputMethodIdsFromLanguageCode(locale,
+                                          input_method::kKeyboardLayoutsOnly,
+                                          &layouts_from_locale);
+  layouts.insert(layouts.end(), layouts_from_locale.begin(),
+                 layouts_from_locale.end());
+
+  std::string selected;
+  if (!layouts_from_locale.empty()) {
+    selected =
+        util->GetInputMethodDescriptorFromId(layouts_from_locale[0])->id();
+  }
+
+  scoped_ptr<base::ListValue> input_methods_list(new base::ListValue);
+  std::set<std::string> input_methods_added;
+  for (std::vector<std::string>::const_iterator it = layouts.begin();
+       it != layouts.end(); ++it) {
+    const input_method::InputMethodDescriptor* ime =
+        util->GetInputMethodDescriptorFromId(*it);
+    if (!InsertString(ime->id(), input_methods_added))
+      continue;
+    input_methods_list->Append(CreateInputMethodsEntry(*ime, selected));
+  }
+  return input_methods_list.Pass();
+}
+
 }  // namespace chromeos