[chromium-reviews] Change the use of "Language" in Spell Check files to "SpellCheckLanguage". "L...

chrome/browser/tab_contents/render_view_context_menu.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 "chrome/browser/tab_contents/render_view_context_menu.h"
 
 #include "app/l10n_util.h"
 #include "base/clipboard.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 164 matching lines @@
   AppendMenuItem(IDS_CONTENT_CONTEXT_COPY);
   AppendMenuItem(IDS_CONTENT_CONTEXT_PASTE);
   AppendMenuItem(IDS_CONTENT_CONTEXT_DELETE);
   AppendSeparator();
 
   // Add Spell Check options sub menu.
   StartSubMenu(IDC_SPELLCHECK_MENU,
       l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_SPELLCHECK_MENU));
 
   // Add Spell Check languages to sub menu.
-  SpellChecker::Languages spellcheck_languages;
+  std::vector<std::string> spellcheck_languages;
   SpellChecker::GetSpellCheckLanguages(profile_,
       &spellcheck_languages);
   DCHECK(spellcheck_languages.size() <
          IDC_SPELLCHECK_LANGUAGES_LAST - IDC_SPELLCHECK_LANGUAGES_FIRST);
   const std::string app_locale = g_browser_process->GetApplicationLocale();
   for (size_t i = 0; i < spellcheck_languages.size(); ++i) {
     string16 display_name(l10n_util::GetDisplayNameForLocale(
         spellcheck_languages[i], app_locale, true));
     AppendRadioMenuItem(IDC_SPELLCHECK_LANGUAGES_FIRST + i, display_name);
   }
@@ skipping 133 matching lines @@
     return (params_.spellcheck_enabled &&
             profile_->GetPrefs()->GetBoolean(prefs::kEnableSpellCheck));
   }
 
   // Don't bother getting the display language vector if this isn't a spellcheck
   // language.
   if ((id < IDC_SPELLCHECK_LANGUAGES_FIRST) ||
       (id >= IDC_SPELLCHECK_LANGUAGES_LAST))
     return false;
 
-  SpellChecker::Languages languages;
+  std::vector<std::string> languages;
   return SpellChecker::GetSpellCheckLanguages(profile_, &languages) ==
       (id - IDC_SPELLCHECK_LANGUAGES_FIRST);
 }
 
 void RenderViewContextMenu::ExecuteItemCommand(int id) {
   // Check to see if one of the spell check language ids have been clicked.
   if (id >= IDC_SPELLCHECK_LANGUAGES_FIRST &&
       id < IDC_SPELLCHECK_LANGUAGES_LAST) {
     const size_t language_number = id - IDC_SPELLCHECK_LANGUAGES_FIRST;
-    SpellChecker::Languages languages;
+    std::vector<std::string> languages;
     SpellChecker::GetSpellCheckLanguages(profile_, &languages);
     if (language_number < languages.size()) {
       StringPrefMember dictionary_language;
       dictionary_language.Init(prefs::kSpellCheckDictionary,
           profile_->GetPrefs(), NULL);
       dictionary_language.SetValue(ASCIIToWide(languages[language_number]));
     }
 
     return;
   }
@@ skipping 289 matching lines @@
       // applications may not enocode non-ASCII characters in UTF-8.
       // So the 4th parameter of net::FormatUrl() should be false.
       // See crbug.com/2820.
       WideToUTF8(net::FormatUrl(
                  url, profile_->GetPrefs()->GetString(prefs::kAcceptLanguages),
                  false, UnescapeRule::NONE, NULL, NULL));
 
   WriteTextToClipboard(UTF8ToUTF16(utf8_text));
   DidWriteURLToClipboard(utf8_text);
 }