Index: chrome/browser/chromeos/input_method/input_method_util.cc |
diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc |
index ca66fa5e2ffbbed7a947b0430b0f3045e91eadd3..8164932a03c4c3b87c26458ce89a319396db9818 100644 |
--- a/chrome/browser/chromeos/input_method/input_method_util.cc |
+++ b/chrome/browser/chromeos/input_method/input_method_util.cc |
@@ -682,9 +682,11 @@ void InputMethodUtil::UpdateHardwareLayoutCache() { |
DCHECK(thread_checker_.CalledOnValidThread()); |
hardware_layouts_.clear(); |
hardware_login_layouts_.clear(); |
- if (cached_hardware_layouts_.empty()) |
- Tokenize(delegate_->GetHardwareKeyboardLayouts(), ",", |
- &cached_hardware_layouts_); |
+ if (cached_hardware_layouts_.empty()) { |
+ cached_hardware_layouts_ = |
+ base::SplitString(delegate_->GetHardwareKeyboardLayouts(), ",", |
+ base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY); |
+ } |
hardware_layouts_ = cached_hardware_layouts_; |
MigrateInputMethods(&hardware_layouts_); |