[chromium-reviews] Fix the bug: Scrolling the Spell-checker drop-down box adds add the languages...

chrome/browser/views/options/languages_page_view.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #include <windows.h>
 #include <shlobj.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "chrome/browser/views/options/languages_page_view.h"
 
@@ skipping 305 matching lines @@
 
   // Set Language List.
   void SetAcceptLanguagesString(const std::wstring& language_list);
 
   // Add at the end.
   void Add(const std::wstring& language);
 
   // Removes the entry at the specified index.
   void Remove(int index);
 
+  // Returns index corresponding to a given language. Returns -1 if the
+  // language is not found.
+  int GetIndex(const std::wstring& language);
+
   // Move down the entry at the specified index.
   void MoveDown(int index);
 
   // Move up the entry at the specified index.
   void MoveUp(int index);
 
   // Returns the set of languagess this model contains.
   std::wstring GetLanguageList() { return VectorToList(languages_); }
 
   // views::TableModel overrides:
@@ skipping 55 matching lines @@
     observer_->OnItemsAdded(RowCount() - 1, 1);
 }
 
 void LanguageOrderTableModel::Remove(int index) {
   DCHECK(index >= 0 && index < RowCount());
   languages_.erase(languages_.begin() + index);
   if (observer_)
     observer_->OnItemsRemoved(index, 1);
 }
 
+int LanguageOrderTableModel::GetIndex(const std::wstring& language) {
+  if (language.empty())
+    return -1;
+
+  int index = 0;
+  for (std::vector<std::wstring>::const_iterator cit = languages_.begin();
+      cit != languages_.end(); ++cit) {
+    if (*cit == language)
+      return index;
+
+    index++;
+  }
+
+  return -1;
+}
+
 void LanguageOrderTableModel::MoveDown(int index) {
   if (index < 0 || index >= RowCount() - 1)
     return;
   std::wstring item = languages_.at(index);
   languages_.erase(languages_.begin() + index);
   if (index == RowCount() - 1)
     languages_.push_back(item);
   else
     languages_.insert(languages_.begin() + index + 1, item);
   if (observer_)
@@ skipping 312 matching lines @@
     if (new_index == starting_ui_language_index_)
       ui_language_index_selected_ = -1;
     else
       ui_language_index_selected_ = new_index;
 
     if (!language_warning_shown_) {
       RestartMessageBox::ShowMessageBox(GetRootWindow());
       language_warning_shown_ = true;
     }
   } else if (sender == change_dictionary_language_combobox_) {
+    // Set the spellcheck language selected.
     spellcheck_language_index_selected_ = new_index;
-    OnAddLanguage(dictionary_language_model_->GetLocaleFromIndex(new_index));
-    language_table_edited_ = true;
+
+    // Remove the previously added spell check language to the accept list.
+    if (!spellcheck_language_added_.empty()) {
+      int old_index = language_order_table_model_->GetIndex(
+          spellcheck_language_added_);
+      if (old_index > -1)
+        language_order_table_model_->Remove(old_index);
+    }
+
+    // Add this new spell check language only if it is not already in the
+    // accept language list.
+    std::wstring language =
+        dictionary_language_model_->GetLocaleFromIndex(new_index);
+    int index = language_order_table_model_->GetIndex(language);
+    if (index == -1) {
+      // Add the new language.
+      OnAddLanguage(language);
+      language_table_edited_ = true;
+      spellcheck_language_added_ = language;
+    } else {
+      spellcheck_language_added_ = L"";
+    }
   }
 }
 
 void LanguagesPageView::OnSelectionChanged() {
   move_up_button_->SetEnabled(language_order_table_->FirstSelectedRow() > 0 &&
                               language_order_table_->SelectedRowCount() == 1);
   move_down_button_->SetEnabled(language_order_table_->FirstSelectedRow() <
                                 language_order_table_->RowCount() - 1 &&
                                 language_order_table_->SelectedRowCount() ==
                                 1);
@@ skipping 47 matching lines @@
         GetLocaleFromIndex(ui_language_index_selected_));
   }
 
   if (spellcheck_language_index_selected_ != -1) {
     UserMetricsRecordAction(L"Options_DictionaryLanguage",
                             profile()->GetPrefs());
     dictionary_language_.SetValue(dictionary_language_model_->
         GetLocaleFromIndex(spellcheck_language_index_selected_));
   }
 }