Now we sort encoding menu according to current application locale, we also...

chrome/browser/views/options/fonts_page_view.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 <windows.h>
 #include <shlobj.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
+#include <vector>
+
 #include "chrome/browser/views/options/fonts_page_view.h"
 
 #include "base/file_util.h"
 #include "base/gfx/native_theme.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/views/password_manager_view.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/checkbox.h"
 #include "chrome/views/grid_layout.h"
 #include "chrome/views/native_button.h"
 #include "chrome/views/radio_button.h"
 #include "chrome/views/text_field.h"
 #include "chrome/views/widget.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/locale_settings.h"
 #include "skia/include/SkBitmap.h"
 
+namespace {
+
+static std::vector<CharacterEncoding::EncodingInfo> sorted_encoding_list;
+
+}  // namespace
+
 class DefaultEncodingComboboxModel : public views::ComboBox::Model {
  public:
   DefaultEncodingComboboxModel() {
     canonical_encoding_names_length_ =
         CharacterEncoding::GetSupportCanonicalEncodingCount();
+    // Initialize the vector of all sorted encodings according to current
+    // UI locale.
+    if (!sorted_encoding_list.size()) {
+      std::wstring locale = g_browser_process->GetApplicationLocale();
+      for (int i = 0; i < canonical_encoding_names_length_; i++) {
+        sorted_encoding_list.push_back(CharacterEncoding::EncodingInfo(
+            CharacterEncoding::GetEncodingCommandIdByIndex(i)));
+      }
+      l10n_util::SortVectorWithStringKey(locale, &sorted_encoding_list, true);
+    }
   }
 
   virtual ~DefaultEncodingComboboxModel() {}
 
   // Overridden from views::Combobox::Model.
   virtual int GetItemCount(views::ComboBox* source) {
     return canonical_encoding_names_length_;
   }
 
   virtual std::wstring GetItemAt(views::ComboBox* source, int index) {
     DCHECK(index >= 0 && canonical_encoding_names_length_ > index);
-    return CharacterEncoding::GetCanonicalEncodingDisplayNameByIndex(index);
+    return sorted_encoding_list[index].encoding_display_name;
   }
 
   std::wstring GetEncodingCharsetByIndex(int index) {
     DCHECK(index >= 0 && canonical_encoding_names_length_ > index);
-    return CharacterEncoding::GetCanonicalEncodingNameByIndex(index);
+    int encoding_id = sorted_encoding_list[index].encoding_id;
+    return CharacterEncoding::GetCanonicalEncodingNameByCommandId(encoding_id);
   }
 
   int GetSelectedEncodingIndex(Profile* profile) {
     StringPrefMember current_encoding_string;
     current_encoding_string.Init(prefs::kDefaultCharset,
                                  profile->GetPrefs(),
                                  NULL);
     const std::wstring current_encoding = current_encoding_string.GetValue();
     for (int i = 0; i < canonical_encoding_names_length_; i++) {
-      if (CharacterEncoding::GetCanonicalEncodingNameByIndex(i) ==
-          current_encoding)
+      if (GetEncodingCharsetByIndex(i) == current_encoding)
         return i;
     }
 
     return 0;
   }
 
  private:
   int canonical_encoding_names_length_;
   DISALLOW_EVIL_CONSTRUCTORS(DefaultEncodingComboboxModel);
 };
@@ skipping 392 matching lines @@
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   // Add Encoding ComboBox.
   layout->StartRow(0, double_column_view_set_id);
   layout->AddView(default_encoding_combobox_label_);
   layout->AddView(default_encoding_combobox_, 1, 1, GridLayout::FILL,
       GridLayout::CENTER);
 }