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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/glue/web_io_operators.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
« webkit/dom_storage/dom_storage_area.h ('K') | « webkit/glue/glue_serialize_unittest.cc ('k') | webkit/glue/webclipboard_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/web_io_operators.cc
diff --git a/webkit/glue/web_io_operators.cc b/webkit/glue/web_io_operators.cc
index 802d2e7b94f9d568942a141f51438f8132b7cd0a..a53f41cbb6a12125c79c7bfe1cfb1fd1eedd9df5 100644
--- a/webkit/glue/web_io_operators.cc
+++ b/webkit/glue/web_io_operators.cc
@@ -12,7 +12,7 @@
#include "ui/gfx/rect.h"
#if defined(WCHAR_T_IS_UTF32)
-#include "base/string16.h"
+#include "base/string16.h.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
#endif // defined(WCHAR_T_IS_UTF32)
@@ -20,7 +20,7 @@ namespace WebKit {
#if defined(WCHAR_T_IS_UTF32)
std::ostream& operator<<(std::ostream& out, const WebString& s) {
- return out << static_cast<string16>(s);
+ return out << static_cast<base::string16>(s);
}
#endif // defined(WCHAR_T_IS_UTF32)
« webkit/dom_storage/dom_storage_area.h ('K') | « webkit/glue/glue_serialize_unittest.cc ('k') | webkit/glue/webclipboard_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698