Fix a bug in Language and Input page that caused "undefined" languge to be added.

BUG=chromium-os:7631
TEST=manually

Review URL: http://codereview.chromium.org/3811003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62514 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 2 deletions

diff --git a/chrome/browser/resources/options/chromeos_language_list.js b/chrome/browser/resources/options/chromeos_language_list.js
index 3ad905c..f1c18c3 100644
--- a/chrome/browser/resources/options/chromeos_language_list.js
+++ b/chrome/browser/resources/options/chromeos_language_list.js
@@ -120,8 +120,9 @@ cr.define('options.language', function() {
      * @param {string} languageCode language code (ex. "fr").
      */
     addLanguage: function(languageCode) {
-      // It shouldn't happen but ignore the language code if it's present.
-      if (this.dataModel.indexOf(languageCode) >= 0) {
+      // It shouldn't happen but ignore the language code if it's
+      // null/undefined, or already present.
+      if (!languageCode || this.dataModel.indexOf(languageCode) >= 0) {
         return;
       }
       this.dataModel.push(languageCode);
diff --git a/chrome/browser/resources/options/chromeos_language_options.js b/chrome/browser/resources/options/chromeos_language_options.js
index b3b75ce..3474b4f 100644
--- a/chrome/browser/resources/options/chromeos_language_options.js
+++ b/chrome/browser/resources/options/chromeos_language_options.js
@@ -472,6 +472,11 @@ cr.define('options', function() {
     handleAddLanguageListClick_ : function(e) {
       var languageOptionsList = $('language-options-list');
       var languageCode = e.target.languageCode;
+      // languageCode can be undefined, if click was made on some random
+      // place in the overlay, rather than a button. Ignore it.
+      if (!languageCode) {
+        return;
+      }
       languageOptionsList.addLanguage(languageCode);
       var inputMethodIds = this.languageCodeToInputMethodIdsMap_[languageCode];
       // Enable the first input method for the language added.