| OLD | NEW |
| 1 // Copyright (c) 2006-2008 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 "ui/gfx/point.h" | 5 #include "ui/gfx/point.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| 11 #include <ostream> | 11 #include "base/stringprintf.h" |
| 12 | 12 |
| 13 namespace gfx { | 13 namespace gfx { |
| 14 | 14 |
| 15 Point::Point() : x_(0), y_(0) { | 15 Point::Point() : x_(0), y_(0) { |
| 16 } | 16 } |
| 17 | 17 |
| 18 Point::Point(int x, int y) : x_(x), y_(y) { | 18 Point::Point(int x, int y) : x_(x), y_(y) { |
| 19 } | 19 } |
| 20 | 20 |
| 21 #if defined(OS_WIN) | 21 #if defined(OS_WIN) |
| (...skipping 20 matching lines...) Expand all Loading... |
| 42 } | 42 } |
| 43 #elif defined(OS_MACOSX) | 43 #elif defined(OS_MACOSX) |
| 44 Point::Point(const CGPoint& point) : x_(point.x), y_(point.y) { | 44 Point::Point(const CGPoint& point) : x_(point.x), y_(point.y) { |
| 45 } | 45 } |
| 46 | 46 |
| 47 CGPoint Point::ToCGPoint() const { | 47 CGPoint Point::ToCGPoint() const { |
| 48 return CGPointMake(x_, y_); | 48 return CGPointMake(x_, y_); |
| 49 } | 49 } |
| 50 #endif | 50 #endif |
| 51 | 51 |
| 52 std::ostream& operator<<(std::ostream& out, const gfx::Point& p) { | 52 std::string Point::ToString() const { |
| 53 return out << p.x() << "," << p.y(); | 53 return base::StringPrintf("%d,%d", x_, y_); |
| 54 } | 54 } |
| 55 | 55 |
| 56 } // namespace gfx | 56 } // namespace gfx |
| OLD | NEW |