Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1122)

Unified Diff: webkit/glue/ftp_directory_listing_response_delegate.cc

Issue 13219005: Replace string16 with base::string16 in src/webkit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/glue/ftp_directory_listing_response_delegate.cc
diff --git a/webkit/glue/ftp_directory_listing_response_delegate.cc b/webkit/glue/ftp_directory_listing_response_delegate.cc
index 076dfc0eba22d72ff21ca01c39a9830cff2275b0..3543d368d45a119a0043a25426c18bd2165da961 100644
--- a/webkit/glue/ftp_directory_listing_response_delegate.cc
+++ b/webkit/glue/ftp_directory_listing_response_delegate.cc
@@ -29,7 +29,7 @@ using WebKit::WebURLResponse;
namespace {
-string16 ConvertPathToUTF16(const std::string& path) {
+base::string16 ConvertPathToUTF16(const std::string& path) {
// Per RFC 2640, FTP servers should use UTF-8 or its proper subset ASCII,
// but many old FTP servers use legacy encodings. Try UTF-8 first.
if (IsStringUTF8(path))
@@ -39,7 +39,7 @@ string16 ConvertPathToUTF16(const std::string& path) {
// fail.
std::string encoding;
if (base::DetectEncoding(path, &encoding) && !encoding.empty()) {
- string16 path_utf16;
+ base::string16 path_utf16;
if (base::CodepageToUTF16(path, encoding.c_str(),
base::OnStringConversionError::SUBSTITUTE,
&path_utf16)) {

Powered by Google App Engine
This is Rietveld 408576698