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

Unified Diff: chrome/browser/chromeos/input_method/input_method_delegate_impl.cc

Issue 139803010: Support comma separated hardware keyboard layout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile failure Created 6 years, 10 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
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(

Powered by Google App Engine
This is Rietveld 408576698