diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-16 19:47:53 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-16 19:47:53 +0000 |
| commit | 5829e67b3a7492d92ed202c0cd53268723afce87 (patch) | |
| tree | 87204f347c7a07f4202a3f1aa026d4ba1724ee5e /chrome/app/chrome_dll_resource.h | |
| parent | 9b83b4880858f85eb0ec47929fa6505553d29614 (diff) | |
| download | chromium_src-5829e67b3a7492d92ed202c0cd53268723afce87.zip chromium_src-5829e67b3a7492d92ed202c0cd53268723afce87.tar.gz chromium_src-5829e67b3a7492d92ed202c0cd53268723afce87.tar.bz2 | |
Fix resource ID conflict. Original patch by Thiago Farina (see http://codereview.chromium.org/273063 ), r=me.
BUG=none
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll_resource.h')
| -rw-r--r-- | chrome/app/chrome_dll_resource.h | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h index d83cf8a..db8c799 100644 --- a/chrome/app/chrome_dll_resource.h +++ b/chrome/app/chrome_dll_resource.h @@ -95,44 +95,44 @@ // When adding a new encoding to this list, be sure to append it to the // EncodingMenuController::kValidEncodingIds array in // encoding_menu_controller.cc. -#define IDC_ENCODING_AUTO_DETECT 35006 -#define IDC_ENCODING_UTF8 35007 -#define IDC_ENCODING_UTF16LE 35008 -#define IDC_ENCODING_ISO88591 35009 -#define IDC_ENCODING_WINDOWS1252 35010 -#define IDC_ENCODING_GBK 35011 -#define IDC_ENCODING_GB18030 35012 -#define IDC_ENCODING_BIG5 35013 -#define IDC_ENCODING_BIG5HKSCS 35014 -#define IDC_ENCODING_KOREAN 35015 -#define IDC_ENCODING_SHIFTJIS 35016 -#define IDC_ENCODING_ISO2022JP 35017 -#define IDC_ENCODING_EUCJP 35018 -#define IDC_ENCODING_THAI 35019 -#define IDC_ENCODING_ISO885915 35020 -#define IDC_ENCODING_MACINTOSH 35021 -#define IDC_ENCODING_ISO88592 35022 -#define IDC_ENCODING_WINDOWS1250 35023 -#define IDC_ENCODING_ISO88595 35024 -#define IDC_ENCODING_WINDOWS1251 35025 -#define IDC_ENCODING_KOI8R 35026 -#define IDC_ENCODING_KOI8U 35027 -#define IDC_ENCODING_ISO88597 35028 -#define IDC_ENCODING_WINDOWS1253 35029 -#define IDC_ENCODING_ISO88594 35030 -#define IDC_ENCODING_ISO885913 35031 -#define IDC_ENCODING_WINDOWS1257 35032 -#define IDC_ENCODING_ISO88593 35033 -#define IDC_ENCODING_ISO885910 35034 -#define IDC_ENCODING_ISO885914 35035 -#define IDC_ENCODING_ISO885916 35036 -#define IDC_ENCODING_WINDOWS1254 35037 -#define IDC_ENCODING_ISO88596 35038 -#define IDC_ENCODING_WINDOWS1256 35039 -#define IDC_ENCODING_ISO88598 35040 -#define IDC_ENCODING_WINDOWS1255 35041 -#define IDC_ENCODING_WINDOWS1258 35042 -#define IDC_ENCODING_ISO88598I 35043 +#define IDC_ENCODING_AUTO_DETECT 35500 +#define IDC_ENCODING_UTF8 35501 +#define IDC_ENCODING_UTF16LE 35502 +#define IDC_ENCODING_ISO88591 35503 +#define IDC_ENCODING_WINDOWS1252 35504 +#define IDC_ENCODING_GBK 35505 +#define IDC_ENCODING_GB18030 35506 +#define IDC_ENCODING_BIG5 35507 +#define IDC_ENCODING_BIG5HKSCS 35508 +#define IDC_ENCODING_KOREAN 35509 +#define IDC_ENCODING_SHIFTJIS 35510 +#define IDC_ENCODING_ISO2022JP 35511 +#define IDC_ENCODING_EUCJP 35512 +#define IDC_ENCODING_THAI 35513 +#define IDC_ENCODING_ISO885915 35514 +#define IDC_ENCODING_MACINTOSH 35515 +#define IDC_ENCODING_ISO88592 35516 +#define IDC_ENCODING_WINDOWS1250 35517 +#define IDC_ENCODING_ISO88595 35518 +#define IDC_ENCODING_WINDOWS1251 35519 +#define IDC_ENCODING_KOI8R 35520 +#define IDC_ENCODING_KOI8U 35521 +#define IDC_ENCODING_ISO88597 35522 +#define IDC_ENCODING_WINDOWS1253 35523 +#define IDC_ENCODING_ISO88594 35524 +#define IDC_ENCODING_ISO885913 35525 +#define IDC_ENCODING_WINDOWS1257 35526 +#define IDC_ENCODING_ISO88593 35527 +#define IDC_ENCODING_ISO885910 35528 +#define IDC_ENCODING_ISO885914 35529 +#define IDC_ENCODING_ISO885916 35530 +#define IDC_ENCODING_WINDOWS1254 35531 +#define IDC_ENCODING_ISO88596 35532 +#define IDC_ENCODING_WINDOWS1256 35533 +#define IDC_ENCODING_ISO88598 35534 +#define IDC_ENCODING_WINDOWS1255 35535 +#define IDC_ENCODING_WINDOWS1258 35536 +#define IDC_ENCODING_ISO88598I 35537 // Clipboard commands #define IDC_CUT 36000 |