Get rid of ISO-8859-9 in the character encoding menu because it's now treated as an alias to its superset, windows-1254.

BUG=4746
TEST=visit http://www.sabah.com.tr (ISO-8859-9 page) and make sure that 'Turkish' is checked in the encoding menu


Review URL: http://codereview.chromium.org/11811

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

4 files changed, 9 insertions, 13 deletions

diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h
index 61a135c..b9af6d6 100644
--- a/chrome/app/chrome_dll_resource.h
+++ b/chrome/app/chrome_dll_resource.h
@@ -123,13 +123,13 @@
 #define IDC_ENCODING_ISO885910          32920
 #define IDC_ENCODING_ISO885914          32921
 #define IDC_ENCODING_ISO885916          32922
-#define IDC_ENCODING_ISO88599           32923
-#define IDC_ENCODING_WINDOWS1254        32924
-#define IDC_ENCODING_ISO88596           32925
-#define IDC_ENCODING_WINDOWS1256        32926
-#define IDC_ENCODING_ISO88598           32927
-#define IDC_ENCODING_WINDOWS1255        32928
-#define IDC_ENCODING_WINDOWS1258        32929
+#define IDC_ENCODING_WINDOWS1254        32923
+#define IDC_ENCODING_ISO88596           32924
+#define IDC_ENCODING_WINDOWS1256        32925
+#define IDC_ENCODING_ISO88598           32926
+#define IDC_ENCODING_WINDOWS1255        32927
+#define IDC_ENCODING_WINDOWS1258        32928
+// Free space 32929
 // Spell-check suggestions.
 // If more suggestions have to be inserted, insert them before the _LAST
 // These have to be consecutive.
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 375f566..efacd90 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1157,7 +1157,6 @@ void Browser::ExecuteCommand(int id) {
     case IDC_ENCODING_ISO885910:
     case IDC_ENCODING_ISO885914:
     case IDC_ENCODING_ISO885916:
-    case IDC_ENCODING_ISO88599:
     case IDC_ENCODING_WINDOWS1254:
     case IDC_ENCODING_ISO88596:
     case IDC_ENCODING_WINDOWS1256:
@@ -1929,7 +1928,6 @@ void Browser::InitCommandState() {
   controller_.UpdateCommandEnabled(IDC_ENCODING_ISO885910, true);
   controller_.UpdateCommandEnabled(IDC_ENCODING_ISO885914, true);
   controller_.UpdateCommandEnabled(IDC_ENCODING_ISO885916, true);
-  controller_.UpdateCommandEnabled(IDC_ENCODING_ISO88599, true);
   controller_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1254, true);
   controller_.UpdateCommandEnabled(IDC_ENCODING_ISO88596, true);
   controller_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1256, true);
diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc
index c40895b..6fb8d97 100644
--- a/chrome/browser/character_encoding.cc
+++ b/chrome/browser/character_encoding.cc
@@ -53,7 +53,6 @@ static CanonicalEncodingData canonical_encoding_names[] = {
   { IDC_ENCODING_KOI8U, L"KOI8-U", IDS_ENCODING_CYRILLIC },
   { IDC_ENCODING_ISO88597, L"ISO-8859-7", IDS_ENCODING_GREEK },
   { IDC_ENCODING_WINDOWS1253, L"windows-1253", IDS_ENCODING_GREEK },
-  { IDC_ENCODING_ISO88599, L"ISO-8859-9", IDS_ENCODING_TURKISH },
   { IDC_ENCODING_WINDOWS1254, L"windows-1254", IDS_ENCODING_TURKISH },
   { IDC_ENCODING_ISO88596, L"ISO-8859-6", IDS_ENCODING_ARABIC },
   { IDC_ENCODING_WINDOWS1256, L"windows-1256", IDS_ENCODING_ARABIC },
@@ -178,7 +177,6 @@ const int default_encoding_menus[] = {
   0,
   IDC_ENCODING_ISO88597,
   IDC_ENCODING_WINDOWS1253,
-  IDC_ENCODING_ISO88599,
   IDC_ENCODING_WINDOWS1254,
   IDC_ENCODING_ISO88596,
   IDC_ENCODING_WINDOWS1256,
@@ -220,7 +218,8 @@ std::wstring GetEncodingDisplayName(std::wstring encoding_name,
                                     int category_string_id) {
   std::wstring category_name = l10n_util::GetString(category_string_id);
   if (category_string_id != IDS_ENCODING_KOREAN &&
-      category_string_id != IDS_ENCODING_THAI) {
+      category_string_id != IDS_ENCODING_THAI &&
+      category_string_id != IDS_ENCODING_TURKISH) {
     return l10n_util::GetStringF(IDS_ENCODING_DISPLAY_TEMPLATE,
                                  category_name,
                                  encoding_name);
diff --git a/chrome/browser/encoding_menu_controller_delegate.cc b/chrome/browser/encoding_menu_controller_delegate.cc
index 3b12114..38dcb10 100644
--- a/chrome/browser/encoding_menu_controller_delegate.cc
+++ b/chrome/browser/encoding_menu_controller_delegate.cc
@@ -68,7 +68,6 @@ bool EncodingMenuControllerDelegate::IsItemChecked(int id) const {
     case IDC_ENCODING_ISO885910:
     case IDC_ENCODING_ISO885914:
     case IDC_ENCODING_ISO885916:
-    case IDC_ENCODING_ISO88599:
     case IDC_ENCODING_WINDOWS1254:
     case IDC_ENCODING_ISO88596:
     case IDC_ENCODING_WINDOWS1256: