Index: chrome/browser/chromeos/input_method/input_method_delegate_impl.cc |
diff --git a/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc b/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc |
index ddfbe69dea6b4f17f41d8981ef514b9847453d28..2575ca8dd2edd56f4333cb6448286fc8ce407c45 100644 |
--- a/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc |
+++ b/chrome/browser/chromeos/input_method/input_method_delegate_impl.cc |
@@ -6,6 +6,7 @@ |
#include "base/logging.h" |
#include "base/prefs/pref_service.h" |
+#include "base/strings/string_util.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/common/pref_names.h" |
#include "ui/base/l10n/l10n_util.h" |
@@ -15,15 +16,18 @@ namespace input_method { |
InputMethodDelegateImpl::InputMethodDelegateImpl() {} |
-std::string InputMethodDelegateImpl::GetHardwareKeyboardLayout() const { |
- if (g_browser_process) { |
- PrefService* local_state = g_browser_process->local_state(); |
- if (local_state) |
- return local_state->GetString(prefs::kHardwareKeyboardLayout); |
- } |
- // This shouldn't happen but just in case. |
- DVLOG(1) << "Local state is not yet ready."; |
- return std::string(); |
+void InputMethodDelegateImpl::GetHardwareKeyboardLayout( |
+ std::vector<std::string>* out) const { |
+ DCHECK(out); |
+ out->clear(); |
+ if (!g_browser_process) |
+ return; |
+ |
+ PrefService* local_state = g_browser_process->local_state(); |
+ if (!local_state) |
+ return; |
+ |
+ Tokenize(local_state->GetString(prefs::kHardwareKeyboardLayout), ",", out); |
} |
base::string16 InputMethodDelegateImpl::GetLocalizedString( |