| Index: chrome/browser/ui/webui/chromeos/login/l10n_util.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util.cc b/chrome/browser/ui/webui/chromeos/login/l10n_util.cc
|
| index dbc4ab355df974e0bd66987f3d117b773d8ecdad..bcc506b13ffe19c8a52773c215cb3b04123414fa 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/l10n_util.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/l10n_util.cc
|
| @@ -322,6 +322,13 @@ void GetKeyboardLayoutsForResolvedLocale(
|
| it != layouts.end(); ++it) {
|
| const input_method::InputMethodDescriptor* ime =
|
| util->GetInputMethodDescriptorFromId(*it);
|
| + // TODO(tbarzic): This is added to avoid crash loop on starting public
|
| + // session. The problem should be properly fixed, and this workaround
|
| + // removed.
|
| + if (!ime) {
|
| + LOG(WARNING) << *it << " layout not found.";
|
| + continue;
|
| + }
|
| if (!InsertString(ime->id(), &input_methods_added))
|
| continue;
|
| input_methods_list->Append(CreateInputMethodsEntry(*ime, selected));
|
|
|