From 42556715b034aada746075eb7ce7b91b21d70d9e Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Fri, 23 Sep 2011 00:30:54 +0000
Subject: [PATCH] Mac: Fix GetLocalizedString() implementation.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@293 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 libcef/browser_webkit_glue_mac.mm | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/libcef/browser_webkit_glue_mac.mm b/libcef/browser_webkit_glue_mac.mm
index b4536e673..71dc2c302 100644
--- a/libcef/browser_webkit_glue_mac.mm
+++ b/libcef/browser_webkit_glue_mac.mm
@@ -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;
 }