summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-16 09:08:45 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-16 09:08:45 +0000
commit73374da795c8cdcaffe75e2e41c4644973ee5574 (patch)
treed7347f0c4a62ae299250251fed05a675c830f3cc /chrome/browser
parent4cb028f7d98b8ed549c6030edbf1386fd804c218 (diff)
downloadchromium_src-73374da795c8cdcaffe75e2e41c4644973ee5574.zip
chromium_src-73374da795c8cdcaffe75e2e41c4644973ee5574.tar.gz
chromium_src-73374da795c8cdcaffe75e2e41c4644973ee5574.tar.bz2
Add logic to enable the default input method for the language added.
When a new language is added, the default input method associated with the langauge should be enabled. TEST=manually BUG=chromium-os:5657 Review URL: http://codereview.chromium.org/3180008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56191 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/resources/options/chromeos_language_options.js14
1 files changed, 13 insertions, 1 deletions
diff --git a/chrome/browser/resources/options/chromeos_language_options.js b/chrome/browser/resources/options/chromeos_language_options.js
index 61a1fc4..ab1421b 100644
--- a/chrome/browser/resources/options/chromeos_language_options.js
+++ b/chrome/browser/resources/options/chromeos_language_options.js
@@ -379,7 +379,19 @@ cr.define('options', function() {
*/
handleAddLanguageListClick_ : function(e) {
var languageOptionsList = $('language-options-list');
- languageOptionsList.addLanguage(e.target.languageCode);
+ var languageCode = e.target.languageCode;
+ languageOptionsList.addLanguage(languageCode);
+ var inputMethodIds = this.languageCodeToInputMethodIdsMap_[languageCode];
+ // Enable the first input method for the language added.
+ if (inputMethodIds && inputMethodIds[0] &&
+ // Don't add the input method it's already present. This can
+ // happen if the same input method is shared among multiple
+ // languages (ex. English US keyboard is used for English US and
+ // Filipino).
+ this.preloadEngines_.indexOf(inputMethodIds[0]) == -1) {
+ this.preloadEngines_.push(inputMethodIds[0]);
+ this.savePreloadEnginesPref_();
+ }
OptionsPage.clearOverlays();
},