OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "webkit/glue/web_io_operators.h" | 5 #include "webkit/glue/web_io_operators.h" |
6 | 6 |
7 #include <ostream> | 7 #include <ostream> |
8 | 8 |
9 #include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" | 9 #include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" |
10 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" | 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" |
11 #include "ui/gfx/point.h" | 11 #include "ui/gfx/point.h" |
12 #include "ui/gfx/rect.h" | 12 #include "ui/gfx/rect.h" |
13 | 13 |
14 #if defined(WCHAR_T_IS_UTF32) | 14 #if defined(WCHAR_T_IS_UTF32) |
15 #include "base/string16.h" | 15 #include "base/string16.h.h" |
16 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" | 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" |
17 #endif // defined(WCHAR_T_IS_UTF32) | 17 #endif // defined(WCHAR_T_IS_UTF32) |
18 | 18 |
19 namespace WebKit { | 19 namespace WebKit { |
20 | 20 |
21 #if defined(WCHAR_T_IS_UTF32) | 21 #if defined(WCHAR_T_IS_UTF32) |
22 std::ostream& operator<<(std::ostream& out, const WebString& s) { | 22 std::ostream& operator<<(std::ostream& out, const WebString& s) { |
23 return out << static_cast<string16>(s); | 23 return out << static_cast<base::string16>(s); |
24 } | 24 } |
25 #endif // defined(WCHAR_T_IS_UTF32) | 25 #endif // defined(WCHAR_T_IS_UTF32) |
26 | 26 |
27 std::ostream& operator<<(std::ostream& out, const WebPoint& p) { | 27 std::ostream& operator<<(std::ostream& out, const WebPoint& p) { |
28 return out << static_cast<gfx::Point>(p).ToString(); | 28 return out << static_cast<gfx::Point>(p).ToString(); |
29 } | 29 } |
30 | 30 |
31 std::ostream& operator<<(std::ostream& out, const WebRect& p) { | 31 std::ostream& operator<<(std::ostream& out, const WebRect& p) { |
32 return out << static_cast<gfx::Rect>(p).ToString(); | 32 return out << static_cast<gfx::Rect>(p).ToString(); |
33 } | 33 } |
34 | 34 |
35 } // namespace WebKit | 35 } // namespace WebKit |
OLD | NEW |