diff options
| author | kinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-05 03:18:21 +0000 |
|---|---|---|
| committer | kinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-05 03:18:21 +0000 |
| commit | 438afb18f42fc12887bde2400abe49af52b7692d (patch) | |
| tree | 0792769a4f5a81d11461c21381f420852e120b78 | |
| parent | b1846559baf375f9f6c4d6a67eed80f23bb58fc1 (diff) | |
| download | chromium_src-438afb18f42fc12887bde2400abe49af52b7692d.zip chromium_src-438afb18f42fc12887bde2400abe49af52b7692d.tar.gz chromium_src-438afb18f42fc12887bde2400abe49af52b7692d.tar.bz2 | |
Fix ExtensionService::ReportExtensionLoadError's non-ASCII text handling.
Error messages may be out of ASCII range, and in that case,
debug build chokes here and release build emits a garbled text.
BUG=None
TEST=Manually tested the following steps:
1) Install an unpacked extension.
2) Quit Chrome and delete the unpacked extension directory.
3) Run debug version of Chrome with LANG=ja (on Linux).
4) Verify that DCHECK in ASCIIToUTF16 is not triggered.
Review URL: https://chromiumcodereview.appspot.com/10694080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145498 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_service.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index f9d9be9..45f5c57 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -2311,7 +2311,7 @@ void ExtensionService::ReportExtensionLoadError( content::Details<const std::string>(&error)); std::string path_str = UTF16ToUTF8(extension_path.LossyDisplayName()); - string16 message = ASCIIToUTF16(base::StringPrintf( + string16 message = UTF8ToUTF16(base::StringPrintf( "Could not load extension from '%s'. %s", path_str.c_str(), error.c_str())); ExtensionErrorReporter::GetInstance()->ReportError(message, be_noisy); |