bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Mac: Fix GetLocalizedString() implementation.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@293 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-09-23 00:30:54 +00:00
parent 0fc3af0dbb
commit 42556715b0
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libcef/browser_webkit_glue_mac.mm
View File

@@ -60,9 +60,22 @@ string16 GetLocalizedString(int message_id) {
LOG(FATAL) << "failed to load webkit string with id " << message_id;
}
string16 result;
UTF8ToUTF16(res.data(), res.length(), &result);
return result;
// Data packs hold strings as either UTF8 or UTF16.
string16 msg;
switch (g_resource_data_pack->GetTextEncodingType()) {
case ui::DataPack::UTF8:
msg = UTF8ToUTF16(res);
break;
case ui::DataPack::UTF16:
msg = string16(reinterpret_cast<const char16*>(res.data()),
res.length() / 2);
break;
case ui::DataPack::BINARY:
default:
break;
}
return msg;
}