Convert std::wstring encoding names to std::string in a bunch of files.

chrome/browser/encoding_menu_controller.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/encoding_menu_controller.h"
 
 #include "app/l10n_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
@@ skipping 59 matching lines @@
 const int* EncodingMenuController::ValidGUIEncodingIDs() {
   return kValidEncodingIds;
 }
 
 int EncodingMenuController::NumValidGUIEncodingIDs() {
   return arraysize(kValidEncodingIds);
 }
 
 bool EncodingMenuController::IsItemChecked(
     Profile* browser_profile,
-    const std::wstring& current_tab_encoding,
+    const std::string& current_tab_encoding,
     int item_id) {
   if (!DoesCommandBelongToEncodingMenu(item_id)) {
     return false;
   }
 
-  std::wstring encoding = current_tab_encoding;
+  std::string encoding = current_tab_encoding;
   if (encoding.empty()) {
-    encoding = browser_profile->GetPrefs()->GetString(prefs::kDefaultCharset);
+    encoding = WideToASCII(browser_profile->GetPrefs()->GetString(
+        prefs::kDefaultCharset));
   }
 
   if (item_id == IDC_ENCODING_AUTO_DETECT) {
     return browser_profile->GetPrefs()->GetBoolean(
         prefs::kWebKitUsesUniversalDetector);
   }
 
   if (!encoding.empty()) {
     return encoding ==
         CharacterEncoding::GetCanonicalEncodingNameByCommandId(item_id);
   }
 
   return false;
 }
 
 void EncodingMenuController::GetEncodingMenuItems(Profile* profile,
     EncodingMenuItemList* menuItems) {
 
   DCHECK(menuItems);
-  EncodingMenuItem separator(0, L"");
+  EncodingMenuItem separator(0, string16());
 
   menuItems->clear();
   menuItems->push_back(
       EncodingMenuItem(IDC_ENCODING_AUTO_DETECT,
-                       l10n_util::GetString(IDS_ENCODING_AUTO_DETECT)));
+                       l10n_util::GetStringUTF16(IDS_ENCODING_AUTO_DETECT)));
   menuItems->push_back(separator);
 
   // Create current display encoding list.
   const std::vector<CharacterEncoding::EncodingInfo>* encodings;
 
   // Build the list of encoding ids : It is made of the
   // locale-dependent short list, the cache of recently selected
   // encodings and other encodings.
   encodings = CharacterEncoding::GetCurrentDisplayEncodings(
       g_browser_process->GetApplicationLocale(),
-      profile->GetPrefs()->GetString(prefs::kStaticEncodings),
-      profile->GetPrefs()->GetString(prefs::kRecentlySelectedEncoding));
+      WideToASCII(profile->GetPrefs()->GetString(prefs::kStaticEncodings)),
+      WideToASCII(profile->GetPrefs()->GetString(
+          prefs::kRecentlySelectedEncoding)));
   DCHECK(encodings);
   DCHECK(!encodings->empty());
 
   // Build up output list for menu.
   std::vector<CharacterEncoding::EncodingInfo>::const_iterator it;
   for (it = encodings->begin(); it != encodings->end(); ++it) {
     if (it->encoding_id) {
       std::wstring encoding = it->encoding_display_name;
       std::wstring bidi_safe_encoding;
       if (l10n_util::AdjustStringForLocaleDirection(encoding,
                                                     &bidi_safe_encoding))
         encoding.swap(bidi_safe_encoding);
-      menuItems->push_back(EncodingMenuItem(it->encoding_id, encoding));
+      menuItems->push_back(EncodingMenuItem(it->encoding_id,
+                                            WideToUTF16(encoding)));
     } else {
       menuItems->push_back(separator);
     }
   }
-
 }