summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-08 12:38:26 +0000
committerjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-08 12:38:26 +0000
commit50f9185a1132aa5727e7e79c1fae7541bdb26da8 (patch)
tree9c1c4c5f4cdded2414bee5e20b5586421b8497bf /chrome_frame
parent5590c6f33487b5ed7724466162db56a9d3876d47 (diff)
downloadchromium_src-50f9185a1132aa5727e7e79c1fae7541bdb26da8.zip
chromium_src-50f9185a1132aa5727e7e79c1fae7541bdb26da8.tar.gz
chromium_src-50f9185a1132aa5727e7e79c1fae7541bdb26da8.tar.bz2
Canonical encoding name : windows-949 => EUC-KR
This is the chromium side of a blink change at https://codereview.chromium.org/25870005 Until the corresponding blink CL above is re-landed (it's landed but reverted), disable EUC-KR-related test temporarily. This is a copy of https://codereview.chromium.org/25769005/ (lgtm'd and approved). BUG=277027, 95963 TEST=browser test: BrowserEncodingTest.* and EncodingAlias*. TBR=thakis,robertshield Review URL: https://codereview.chromium.org/26439002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227506 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_active_document.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/chrome_active_document.h b/chrome_frame/chrome_active_document.h
index 3afcd0f..9f23b90 100644
--- a/chrome_frame/chrome_active_document.h
+++ b/chrome_frame/chrome_active_document.h
@@ -91,7 +91,7 @@ class ChromeActiveDocument;
V(INTERNAL_IE_ENCODINGMENU_JAPAN_AUTOSELECT, 3634, "ISO-2022-JP") \
V(INTERNAL_IE_ENCODINGMENU_JAPAN_EUC, 3635, "EUC-JP") \
V(INTERNAL_IE_ENCODINGMENU_JAPAN_SHIFT_JIS, 3636, "Shift_JIS") \
- V(INTERNAL_IE_ENCODINGMENU_KOREA, 3637, "windows-949") \
+ V(INTERNAL_IE_ENCODINGMENU_KOREA, 3637, "EUC-KR") \
V(INTERNAL_IE_ENCODINGMENU_THAI, 3638, "windows-874") \
V(INTERNAL_IE_ENCODINGMENU_TURKISH_ISO, 3639, "windows-1254") \
V(INTERNAL_IE_ENCODINGMENU_TURKISH_WINDOWS, 3640, "windows-1254") \