summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
diff options
context:
space:
mode:
authornona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-18 13:51:31 +0000
committernona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-18 13:51:31 +0000
commitd4f45da56975c4ccc8bf3d7ad5a6382ca7f4bfbe (patch)
treecebdc51464a1ba5e336c4c840959018044647cdf /chrome/browser/chromeos/input_method/input_method_manager_impl.cc
parent8d7019c5f7be9ffe7ff8241e11a62e85c22d0042 (diff)
downloadchromium_src-d4f45da56975c4ccc8bf3d7ad5a6382ca7f4bfbe.zip
chromium_src-d4f45da56975c4ccc8bf3d7ad5a6382ca7f4bfbe.tar.gz
chromium_src-d4f45da56975c4ccc8bf3d7ad5a6382ca7f4bfbe.tar.bz2
Support multiple languages.
There is a case which the input method is used in multiple languages, e.g. US international is used in many non US languages. This is also helpful for language code variations, e.g. "zh" and "zh-CN". BUG=249200 TEST=ran all tests. Review URL: https://chromiumcodereview.appspot.com/16843010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206974 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/input_method/input_method_manager_impl.cc')
-rw-r--r--chrome/browser/chromeos/input_method/input_method_manager_impl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
index 1b1f297..f2c5d8d 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
@@ -441,7 +441,7 @@ void InputMethodManagerImpl::AddInputMethodExtension(
const std::string& id,
const std::string& name,
const std::vector<std::string>& layouts,
- const std::string& language,
+ const std::vector<std::string>& languages,
const GURL& options_url,
InputMethodEngine* engine) {
if (state_ == STATE_TERMINATING)
@@ -454,7 +454,7 @@ void InputMethodManagerImpl::AddInputMethodExtension(
}
extra_input_methods_[id] =
- InputMethodDescriptor(id, name, layouts, language, options_url);
+ InputMethodDescriptor(id, name, layouts, languages, options_url);
if (Contains(enabled_extension_imes_, id) &&
!ComponentExtensionIMEManager::IsComponentExtensionIMEId(id)) {
if (!Contains(active_input_method_ids_, id)) {