Replace std:;wstring with std::string in locale-name related APIs....

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 66 matching lines @@
 }
 
 void RenderViewContextMenu::AppendLinkItems() {
   AppendMenuItem(IDS_CONTENT_CONTEXT_OPENLINKNEWTAB);
   AppendMenuItem(IDS_CONTENT_CONTEXT_OPENLINKNEWWINDOW);
   AppendMenuItem(IDS_CONTENT_CONTEXT_OPENLINKOFFTHERECORD);
   AppendMenuItem(IDS_CONTENT_CONTEXT_SAVELINKAS);
 
   if (params_.link_url.SchemeIs(chrome::kMailToScheme)) {
     AppendMenuItem(IDS_CONTENT_CONTEXT_COPYLINKLOCATION,
-                   l10n_util::GetString(IDS_CONTENT_CONTEXT_COPYEMAILADDRESS));
+                   l10n_util::GetStringUTF16(
+                       IDS_CONTENT_CONTEXT_COPYEMAILADDRESS));
   } else {
     AppendMenuItem(IDS_CONTENT_CONTEXT_COPYLINKLOCATION);
   }
 }
 
 void RenderViewContextMenu::AppendImageItems() {
   AppendMenuItem(IDS_CONTENT_CONTEXT_SAVEIMAGEAS);
   AppendMenuItem(IDS_CONTENT_CONTEXT_COPYIMAGELOCATION);
   AppendMenuItem(IDS_CONTENT_CONTEXT_COPYIMAGE);
   AppendMenuItem(IDS_CONTENT_CONTEXT_OPENIMAGENEWTAB);
@@ skipping 31 matching lines @@
 }
 
 void RenderViewContextMenu::AppendSearchProvider() {
   DCHECK(profile_);
   const TemplateURL* const default_provider =
       profile_->GetTemplateURLModel()->GetDefaultSearchProvider();
   if (default_provider != NULL) {
     std::wstring selection_text =
         l10n_util::TruncateString(params_.selection_text, 50);
     if (!selection_text.empty()) {
-      std::wstring label(l10n_util::GetStringF(IDS_CONTENT_CONTEXT_SEARCHWEBFOR,
-                         default_provider->short_name(),
-                         selection_text));
+      string16 label(WideToUTF16(
+          l10n_util::GetStringF(IDS_CONTENT_CONTEXT_SEARCHWEBFOR,
+                                default_provider->short_name(),
+                                selection_text)));
       AppendMenuItem(IDS_CONTENT_CONTEXT_SEARCHWEBFOR, label);
     }
   }
 }
 
 void RenderViewContextMenu::AppendEditableItems() {
   // Append Dictionary spell check suggestions.
   for (size_t i = 0; i < params_.dictionary_suggestions.size() &&
        IDC_SPELLCHECK_SUGGESTION_0 + i <= IDC_SPELLCHECK_SUGGESTION_LAST;
        ++i) {
     AppendMenuItem(IDC_SPELLCHECK_SUGGESTION_0 + static_cast<int>(i),
-                   params_.dictionary_suggestions[i]);
+                   WideToUTF16(params_.dictionary_suggestions[i]));
   }
   if (params_.dictionary_suggestions.size() > 0)
     AppendSeparator();
 
   // If word is misspelled, give option for "Add to dictionary"
   if (!params_.misspelled_word.empty()) {
     if (params_.dictionary_suggestions.size() == 0) {
       AppendMenuItem(0,
-          l10n_util::GetString(IDS_CONTENT_CONTEXT_NO_SPELLING_SUGGESTIONS));
+          l10n_util::GetStringUTF16(
+              IDS_CONTENT_CONTEXT_NO_SPELLING_SUGGESTIONS));
     }
     AppendMenuItem(IDS_CONTENT_CONTEXT_ADD_TO_DICTIONARY);
     AppendSeparator();
   }
 
   AppendMenuItem(IDS_CONTENT_CONTEXT_UNDO);
   AppendMenuItem(IDS_CONTENT_CONTEXT_REDO);
   AppendSeparator();
   AppendMenuItem(IDS_CONTENT_CONTEXT_CUT);
   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::GetString(IDS_CONTENT_CONTEXT_SPELLCHECK_MENU));
+      l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_SPELLCHECK_MENU));
 
   // Add Spell Check languages to sub menu.
-  SpellChecker::Languages display_languages;
+  SpellChecker::Languages spellcheck_languages;
   SpellChecker::GetSpellCheckLanguages(profile_,
-      &display_languages);
-  DCHECK(display_languages.size() <
+      &spellcheck_languages);
+  DCHECK(spellcheck_languages.size() <
          IDC_SPELLCHECK_LANGUAGES_LAST - IDC_SPELLCHECK_LANGUAGES_FIRST);
-  const std::wstring app_locale = g_browser_process->GetApplicationLocale();
-  for (size_t i = 0; i < display_languages.size(); ++i) {
-    std::wstring local_language(l10n_util::GetLocalName(
-        display_languages[i], app_locale, true));
-    AppendRadioMenuItem(IDC_SPELLCHECK_LANGUAGES_FIRST + i, local_language);
+  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);
   }
 
   // Add item in the sub menu to pop up the fonts and languages options menu.
   AppendSeparator();
   AppendMenuItem(IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS);
 
   // Add 'Check the spelling of this field' item in the sub menu.
   AppendCheckboxMenuItem(
       IDC_CHECK_SPELLING_OF_THIS_FIELD,
-      l10n_util::GetString(IDS_CONTENT_CONTEXT_CHECK_SPELLING_OF_THIS_FIELD));
+      l10n_util::GetStringUTF16(
+          IDS_CONTENT_CONTEXT_CHECK_SPELLING_OF_THIS_FIELD));
 
   FinishSubMenu();
 
   AppendSeparator();
   AppendMenuItem(IDS_CONTENT_CONTEXT_SELECTALL);
 }
 
 // Menu delegate functions -----------------------------------------------------
 
 bool RenderViewContextMenu::IsItemCommandEnabled(int id) const {
@@ skipping 434 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);
 }