| Index: ui/gfx/rect.cc
|
| diff --git a/ui/gfx/rect.cc b/ui/gfx/rect.cc
|
| index db5ff8af0a8ebd84cab3d99147615c9198c6d276..bc0a8a9234859665348c5d79690c7584f1093144 100644
|
| --- a/ui/gfx/rect.cc
|
| +++ b/ui/gfx/rect.cc
|
| @@ -15,8 +15,7 @@
|
| #include <cairo.h>
|
| #endif
|
|
|
| -#include <ostream>
|
| -
|
| +#include "base/stringprintf.h"
|
| #include "ui/gfx/insets.h"
|
|
|
| namespace {
|
| @@ -54,6 +53,8 @@ Rect::Rect(const gfx::Point& origin, const gfx::Size& size)
|
| : origin_(origin), size_(size) {
|
| }
|
|
|
| +Rect::~Rect() {}
|
| +
|
| #if defined(OS_WIN)
|
| Rect::Rect(const RECT& r)
|
| : origin_(r.left, r.top) {
|
| @@ -109,7 +110,6 @@ Rect& Rect::operator=(const cairo_rectangle_int_t& r) {
|
| }
|
| #endif
|
|
|
| -
|
| void Rect::SetRect(int x, int y, int width, int height) {
|
| origin_.SetPoint(x, y);
|
| set_width(width);
|
| @@ -273,8 +273,10 @@ bool Rect::SharesEdgeWith(const gfx::Rect& rect) const {
|
| (y() == rect.bottom() || bottom() == rect.y()));
|
| }
|
|
|
| -std::ostream& operator<<(std::ostream& out, const gfx::Rect& r) {
|
| - return out << r.origin().ToString() << " " << r.size().ToString();
|
| +std::string Rect::ToString() const {
|
| + return base::StringPrintf("%s %s",
|
| + origin_.ToString().c_str(),
|
| + size_.ToString().c_str());
|
| }
|
|
|
| } // namespace gfx
|
|
|