Move Mac to using renderer spellchecker.

chrome/browser/gtk/options/languages_page_gtk.cc

 // Copyright (c) 2009 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 "chrome/browser/gtk/options/languages_page_gtk.h"
 
 #include <set>
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/language_combobox_model.h"
 #include "chrome/browser/language_order_table_model.h"
-#include "chrome/browser/spellchecker.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/spellcheck_common.h"
 #include "grit/generated_resources.h"
 
 namespace {
 
 const int kWrapWidth = 475;
 
 GtkWidget* NewComboboxFromModel(ComboboxModel* model) {
   GtkWidget* combobox = gtk_combo_box_new_text();
   int count = model->GetItemCount();
   for (int i = 0; i < count; ++i)
@@ skipping 209 matching lines @@
     enable_autospellcorrect_checkbox_ = gtk_check_button_new_with_label(
         l10n_util::GetStringUTF8(
             IDS_OPTIONS_ENABLE_AUTO_SPELL_CORRECTION).c_str());
     g_signal_connect(G_OBJECT(enable_autospellcorrect_checkbox_), "toggled",
                      G_CALLBACK(OnEnableAutoSpellCheckingToggled), this);
     gtk_box_pack_start(GTK_BOX(spellchecker_vbox),
                        enable_autospellcorrect_checkbox_, FALSE, FALSE, 0);
   }
 
   std::vector<std::string> spell_check_languages;
-  SpellChecker::SpellCheckLanguages(&spell_check_languages);
+  SpellCheckCommon::SpellCheckLanguages(&spell_check_languages);
   dictionary_language_model_.reset(new LanguageComboboxModel(profile(),
       spell_check_languages));
   dictionary_language_combobox_ = NewComboboxFromModel(
       dictionary_language_model_.get());
   g_signal_connect(G_OBJECT(dictionary_language_combobox_), "changed",
                    G_CALLBACK(OnDictionaryLanguageChangedThunk), this);
   GtkWidget* dictionary_language_control =
       gtk_util::CreateLabeledControlsGroup(NULL,
           l10n_util::GetStringUTF8(
               IDS_OPTIONS_CHROME_DICTIONARY_LANGUAGE).c_str(),
@@ skipping 63 matching lines @@
   }
   if (!pref_name || *pref_name == prefs::kSpellCheckDictionary) {
     int index = dictionary_language_model_->GetSelectedLanguageIndex(
         prefs::kSpellCheckDictionary);
 
     // If not found, fall back from "language-region" to "language".
     if (index < 0) {
       const std::string& lang_region = WideToASCII(
           dictionary_language_.GetValue());
       dictionary_language_.SetValue(ASCIIToWide(
-          SpellChecker::GetLanguageFromLanguageRegion(lang_region)));
+          SpellCheckCommon::GetLanguageFromLanguageRegion(lang_region)));
       index = dictionary_language_model_->GetSelectedLanguageIndex(
           prefs::kSpellCheckDictionary);
     }
 
     gtk_combo_box_set_active(GTK_COMBO_BOX(dictionary_language_combobox_),
                              index);
   }
   if (!pref_name || *pref_name == prefs::kEnableSpellCheck) {
     gtk_toggle_button_set_active(
         GTK_TOGGLE_BUTTON(enable_spellchecking_checkbox_),
@@ skipping 131 matching lines @@
     OnAddLanguage(language);
     spellcheck_language_added_ = language;
   } else {
     spellcheck_language_added_ = "";
   }
 
   UserMetricsRecordAction("Options_DictionaryLanguage",
                           profile()->GetPrefs());
   dictionary_language_.SetValue(ASCIIToWide(language));
 }