Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1240)

Unified Diff: chrome/browser/ui/webui/chromeos/login/l10n_util.cc

Issue 2756523003: Null check for IME descriptor in GetKeyboardLayoutsForResovledLocale (Closed)
Patch Set: . Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698