From 57978b2e692371f66c2887089315cac8a44493bb Mon Sep 17 00:00:00 2001 From: "avi@google.com" Date: Mon, 18 Aug 2008 21:11:36 +0000 Subject: Rev string conversions to work in UTF-32 land. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@993 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/glue_util.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'webkit/glue/glue_util.h') diff --git a/webkit/glue/glue_util.h b/webkit/glue/glue_util.h index f4de7a4..e798934 100644 --- a/webkit/glue/glue_util.h +++ b/webkit/glue/glue_util.h @@ -27,11 +27,12 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef WEBKIT_GLUE_GLUE_UTIL_H__ -#define WEBKIT_GLUE_GLUE_UTIL_H__ +#ifndef WEBKIT_GLUE_GLUE_UTIL_H_ +#define WEBKIT_GLUE_GLUE_UTIL_H_ #include +#include "base/string16.h" #include "googleurl/src/gurl.h" namespace WebCore { @@ -45,6 +46,7 @@ namespace webkit_glue { std::string CStringToStdString(const WebCore::CString& str); WebCore::CString StdStringToCString(const std::string& str); std::wstring StringToStdWString(const WebCore::String& str); + std::string16 StringToStdString16(const WebCore::String& str); WebCore::String StdWStringToString(const std::wstring& str); WebCore::String StdStringToString(const std::string& str); @@ -56,4 +58,4 @@ namespace webkit_glue { WebCore::KURL GURLToKURL(const GURL& url); } -#endif // #ifndef WEBKIT_GLUE_GLUE_UTIL_H__ +#endif // #ifndef WEBKIT_GLUE_GLUE_UTIL_H_ -- cgit v1.1