As Brett pointed it out, We normally use 8-bit for encoding names since they're always ASCII. Plus, wstrings will also be 32-bit characters on Linux and Mac, which is expensive. So I make this CL by using std::string instead of std::wstring every time you have an encoding name.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1144 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 8 insertions, 6 deletions

diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc
index cfcdee0..44dc92f 100644
--- a/chrome/browser/views/constrained_window_impl.cc
+++ b/chrome/browser/views/constrained_window_impl.cc
@@ -1046,7 +1046,7 @@ void ConstrainedWindowImpl::OpenURLFromTab(
     const GURL& url,
     WindowOpenDisposition disposition,
     PageTransition::Type transition,
-    const std::wstring& override_encoding) {
+    const std::string& override_encoding) {
   // We ignore source right now.
   owner_->OpenURL(this, url, disposition, transition);
 }
diff --git a/chrome/browser/views/constrained_window_impl.h b/chrome/browser/views/constrained_window_impl.h
index a91586b..987c970 100644
--- a/chrome/browser/views/constrained_window_impl.h
+++ b/chrome/browser/views/constrained_window_impl.h
@@ -81,7 +81,7 @@ class ConstrainedWindowImpl : public ConstrainedWindow,
                               const GURL& url,
                               WindowOpenDisposition disposition,
                               PageTransition::Type transition,
-                              const std::wstring& override_encoding);
+                              const std::string& override_encoding);
 
   // Overridden from TabContentsDelegate:
   virtual void NavigationStateChanged(const TabContents* source,
diff --git a/chrome/browser/views/html_dialog_view.cc b/chrome/browser/views/html_dialog_view.cc
index 07f89c4..99f9748 100644
--- a/chrome/browser/views/html_dialog_view.cc
+++ b/chrome/browser/views/html_dialog_view.cc
@@ -111,7 +111,7 @@ void HtmlDialogView::OpenURLFromTab(TabContents* source,
                                     const GURL& url,
                                     WindowOpenDisposition disposition,
                                     PageTransition::Type transition,
-                                    const std::wstring& override_encoding) {
+                                    const std::string& override_encoding) {
   // Force all links to open in a new window, ignoring the incoming
   // disposition. This is a tabless, modal dialog so we can't just
   // open it in the current frame.
diff --git a/chrome/browser/views/html_dialog_view.h b/chrome/browser/views/html_dialog_view.h
index 51e9abb..b96b79d 100644
--- a/chrome/browser/views/html_dialog_view.h
+++ b/chrome/browser/views/html_dialog_view.h
@@ -83,7 +83,7 @@ class HtmlDialogView
                               const GURL& url,
                               WindowOpenDisposition disposition,
                               PageTransition::Type transition,
-                              const std::wstring& override_encoding);
+                              const std::string& override_encoding);
   virtual void NavigationStateChanged(const TabContents* source,
                                       unsigned changed_flags);
   virtual void ReplaceContents(TabContents* source,
diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc
index 0241cc0..8307933 100644
--- a/chrome/browser/views/options/fonts_page_view.cc
+++ b/chrome/browser/views/options/fonts_page_view.cc
@@ -80,7 +80,8 @@ class DefaultEncodingComboboxModel : public ChromeViews::ComboBox::Model {
 
   std::wstring GetEncodingCharsetByIndex(int index) {
     DCHECK(index >= 0 && canonical_encoding_names_length_ > index);
-    return CharacterEncoding::GetCanonicalEncodingNameByIndex(index);
+    return UTF8ToWide(
+        CharacterEncoding::GetCanonicalEncodingNameByIndex(index));
   }
 
   int GetSelectedEncodingIndex(Profile* profile) {
@@ -88,7 +89,8 @@ class DefaultEncodingComboboxModel : public ChromeViews::ComboBox::Model {
     current_encoding_string.Init(prefs::kDefaultCharset,
                                  profile->GetPrefs(),
                                  NULL);
-    const std::wstring current_encoding = current_encoding_string.GetValue();
+    const std::string current_encoding =
+        WideToUTF8(current_encoding_string.GetValue());
     for (int i = 0; i < canonical_encoding_names_length_; i++) {
       if (CharacterEncoding::GetCanonicalEncodingNameByIndex(i) ==
           current_encoding)