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

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

Issue 13954012: Move GetFallbackInputMethodDescriptor function to InputMethodUtil. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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_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 213308041c9c5912b95bccd81981acf2d39af076..2eef8189313f323a867e1acba26d138edc22b9dc 100644
--- a/chrome/browser/chromeos/input_method/input_method_util.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util.cc
@@ -601,7 +601,7 @@ std::string InputMethodUtil::GetHardwareInputMethodId() const {
// This is totally fine if it's empty. The hardware keyboard layout is
// not stored if startup_manifest.json (OEM customization data) is not
// present (ex. Cr48 doen't have that file).
- return InputMethodDescriptor::GetFallbackInputMethodDescriptor().id();
+ return GetFallbackInputMethodDescriptor().id();
}
return input_method_id;
}
@@ -619,6 +619,15 @@ void InputMethodUtil::SetComponentExtensions(
}
}
+InputMethodDescriptor InputMethodUtil::GetFallbackInputMethodDescriptor() {
+ return InputMethodDescriptor("xkb:us::eng",
+ "",
+ "us",
+ "en-US",
+ "", // options page, not available.
+ false);
+}
+
void InputMethodUtil::ReloadInternalMaps() {
if (supported_input_methods_->size() <= 1) {
DVLOG(1) << "GetSupportedInputMethods returned a fallback ID";

Powered by Google App Engine
This is Rietveld 408576698