summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser.cc2
-rw-r--r--chrome/browser/character_encoding.cc10
-rw-r--r--chrome/browser/encoding_menu_controller_delegate.cc1
3 files changed, 9 insertions, 4 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 81067b0..4e28196 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1175,6 +1175,7 @@ void Browser::ExecuteCommand(int id) {
case IDC_ENCODING_ISO88596:
case IDC_ENCODING_WINDOWS1256:
case IDC_ENCODING_ISO88598:
+ case IDC_ENCODING_ISO88598I:
case IDC_ENCODING_WINDOWS1255:
case IDC_ENCODING_WINDOWS1258: OverrideEncoding(id); break;
@@ -1986,6 +1987,7 @@ void Browser::InitCommandState() {
command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88596, true);
command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1256, true);
command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88598, true);
+ command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88598I, true);
command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1255, true);
command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1258, true);
diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc
index 74086fc..035d6e1 100644
--- a/chrome/browser/character_encoding.cc
+++ b/chrome/browser/character_encoding.cc
@@ -53,10 +53,11 @@ static CanonicalEncodingData canonical_encoding_names[] = {
{ IDC_ENCODING_ISO88597, L"ISO-8859-7", IDS_ENCODING_GREEK },
{ IDC_ENCODING_WINDOWS1253, L"windows-1253", IDS_ENCODING_GREEK },
{ 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 },
- { IDC_ENCODING_ISO88598, L"ISO-8859-8", IDS_ENCODING_HEBREW },
+ { IDC_ENCODING_ISO88596, L"ISO-8859-6", IDS_ENCODING_ARABIC },
{ IDC_ENCODING_WINDOWS1255, L"windows-1255", IDS_ENCODING_HEBREW },
+ { IDC_ENCODING_ISO88598I, L"ISO-8859-8-I", IDS_ENCODING_HEBREW },
+ { IDC_ENCODING_ISO88598, L"ISO-8859-8", IDS_ENCODING_HEBREW },
{ IDC_ENCODING_WINDOWS1258, L"windows-1258", IDS_ENCODING_VIETNAMESE },
{ IDC_ENCODING_ISO88594, L"ISO-8859-4", IDS_ENCODING_BALTIC },
{ IDC_ENCODING_ISO885913, L"ISO-8859-13", IDS_ENCODING_BALTIC },
@@ -156,10 +157,11 @@ const int default_encoding_menus[] = {
IDC_ENCODING_ISO88597,
IDC_ENCODING_WINDOWS1253,
IDC_ENCODING_WINDOWS1254,
- IDC_ENCODING_ISO88596,
IDC_ENCODING_WINDOWS1256,
- IDC_ENCODING_ISO88598,
+ IDC_ENCODING_ISO88596,
IDC_ENCODING_WINDOWS1255,
+ IDC_ENCODING_ISO88598I,
+ IDC_ENCODING_ISO88598,
IDC_ENCODING_WINDOWS1258,
IDC_ENCODING_ISO88594,
IDC_ENCODING_ISO885913,
diff --git a/chrome/browser/encoding_menu_controller_delegate.cc b/chrome/browser/encoding_menu_controller_delegate.cc
index 9f3daeb..d40c110 100644
--- a/chrome/browser/encoding_menu_controller_delegate.cc
+++ b/chrome/browser/encoding_menu_controller_delegate.cc
@@ -69,6 +69,7 @@ bool EncodingMenuControllerDelegate::IsItemChecked(int id) const {
case IDC_ENCODING_ISO88596:
case IDC_ENCODING_WINDOWS1256:
case IDC_ENCODING_ISO88598:
+ case IDC_ENCODING_ISO88598I:
case IDC_ENCODING_WINDOWS1255:
case IDC_ENCODING_WINDOWS1258:
return (!encoding.empty() && encoding ==