1 files changed, 21 insertions, 17 deletions
diff --git a/base/utf_string_conversions.h b/base/utf_string_conversions.h
index 4aa4d41..9e4af87 100644
--- a/base/utf_string_conversions.h
+++ b/base/utf_string_conversions.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/base_api.h"
 #include "base/string16.h"
 #include "base/string_piece.h"
 
@@ -17,20 +18,23 @@
 // do the best it can and put the result in the output buffer. The versions that
 // return strings ignore this error and just return the best conversion
 // possible.
-bool WideToUTF8(const wchar_t* src, size_t src_len, std::string* output);
-std::string WideToUTF8(const std::wstring& wide);
-bool UTF8ToWide(const char* src, size_t src_len, std::wstring* output);
-std::wstring UTF8ToWide(const base::StringPiece& utf8);
-
-bool WideToUTF16(const wchar_t* src, size_t src_len, string16* output);
-string16 WideToUTF16(const std::wstring& wide);
-bool UTF16ToWide(const char16* src, size_t src_len, std::wstring* output);
-std::wstring UTF16ToWide(const string16& utf16);
-
-bool UTF8ToUTF16(const char* src, size_t src_len, string16* output);
-string16 UTF8ToUTF16(const base::StringPiece& utf8);
-bool UTF16ToUTF8(const char16* src, size_t src_len, std::string* output);
-std::string UTF16ToUTF8(const string16& utf16);
+BASE_API bool WideToUTF8(const wchar_t* src, size_t src_len,
+                         std::string* output);
+BASE_API std::string WideToUTF8(const std::wstring& wide);
+BASE_API bool UTF8ToWide(const char* src, size_t src_len, std::wstring* output);
+BASE_API std::wstring UTF8ToWide(const base::StringPiece& utf8);
+
+BASE_API bool WideToUTF16(const wchar_t* src, size_t src_len, string16* output);
+BASE_API string16 WideToUTF16(const std::wstring& wide);
+BASE_API bool UTF16ToWide(const char16* src, size_t src_len,
+                          std::wstring* output);
+BASE_API std::wstring UTF16ToWide(const string16& utf16);
+
+BASE_API bool UTF8ToUTF16(const char* src, size_t src_len, string16* output);
+BASE_API string16 UTF8ToUTF16(const base::StringPiece& utf8);
+BASE_API bool UTF16ToUTF8(const char16* src, size_t src_len,
+                          std::string* output);
+BASE_API std::string UTF16ToUTF8(const string16& utf16);
 
 // We are trying to get rid of wstring as much as possible, but it's too big
 // a mess to do it all at once.  These conversions should be used when we
@@ -47,7 +51,7 @@ std::string UTF16ToUTF8(const string16& utf16);
 
 // These convert an ASCII string, typically a hardcoded constant, to a
 // UTF16/Wide string.
-std::wstring ASCIIToWide(const base::StringPiece& ascii);
-string16 ASCIIToUTF16(const base::StringPiece& ascii);
+BASE_API std::wstring ASCIIToWide(const base::StringPiece& ascii);
+BASE_API string16 ASCIIToUTF16(const base::StringPiece& ascii);
 
 #endif  // BASE_UTF_STRING_CONVERSIONS_H_