From 68bf60380800cbd4210f32433ec0310aa8646da2 Mon Sep 17 00:00:00 2001 From: "tc@google.com" Date: Thu, 5 Feb 2009 00:07:51 +0000 Subject: Convert webkit_glue::GetLocalizedString to return a string16 instead of a wstring. Convert the linux data pack files to pack message strings as utf16 instead of utf8. Review URL: http://codereview.chromium.org/20060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9193 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/common/common_glue.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'chrome/common/common_glue.cc') diff --git a/chrome/common/common_glue.cc b/chrome/common/common_glue.cc index 7d957d9..eb993bd 100644 --- a/chrome/common/common_glue.cc +++ b/chrome/common/common_glue.cc @@ -4,6 +4,8 @@ #include "base/command_line.h" #include "base/path_service.h" +#include "base/string16.h" +#include "base/string_util.h" #include "build/build_config.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" @@ -39,8 +41,8 @@ std::wstring GetWebKitLocale() { return lang; } -std::wstring GetLocalizedString(int message_id) { - return l10n_util::GetString(message_id); +string16 GetLocalizedString(int message_id) { + return WideToUTF16(l10n_util::GetString(message_id)); } } // namespace webkit_glue -- cgit v1.1