diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 01:52:40 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 01:52:40 +0000 |
| commit | 2fbc33967abe8fd301a1c0ce35a625ed98bf41f9 (patch) | |
| tree | 2993e976c8470926d9e7f46a1da099c6045eecde /chrome/installer/util | |
| parent | b33f1d943fd420857d9c5988ce1f4598f9a8765a (diff) | |
| download | chromium_src-2fbc33967abe8fd301a1c0ce35a625ed98bf41f9.zip chromium_src-2fbc33967abe8fd301a1c0ce35a625ed98bf41f9.tar.gz chromium_src-2fbc33967abe8fd301a1c0ce35a625ed98bf41f9.tar.bz2 | |
Revert "Another dependency the bbot missed!!!"
This reverts commit 161f7fd3bdd425167af9fe26fdc5373a2ff44c98.
Revert "Missed a file as part of checkin for r48186"
This reverts commit cff86beba5938209393a6c3bccced62a7f3ff36b.
Revert "Enable warning 4389 as an error on windows builds. This will make"
This reverts commit c78936bcfc65b98edf288191d927a495b0364621.
TBR=mbelshe
Review URL: http://codereview.chromium.org/2253001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util')
| -rw-r--r-- | chrome/installer/util/l10n_string_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/installer/util/l10n_string_util.cc b/chrome/installer/util/l10n_string_util.cc index 2f571de..6e9b726 100644 --- a/chrome/installer/util/l10n_string_util.cc +++ b/chrome/installer/util/l10n_string_util.cc @@ -42,7 +42,7 @@ std::wstring GetSystemLanguage(const bool use_omaha_language) { } length = GetLocaleInfo(id, LOCALE_SISO639LANGNAME, WriteInto(&language, length), length); - DCHECK(length == static_cast<int>(language.length() + 1)); + DCHECK(length == language.length() + 1); StringToLowerASCII(&language); // Add the country if we need it. @@ -51,7 +51,7 @@ std::wstring GetSystemLanguage(const bool use_omaha_language) { if (0 != length) { length = GetLocaleInfo(id, LOCALE_SISO3166CTRYNAME, WriteInto(&country, length), length); - DCHECK(length == static_cast<int>(country.length() + 1)); + DCHECK(length == country.length() + 1); StringToLowerASCII(&country); if (L"en" == language) { if (L"gb" == country) { |