| Index: ui/gfx/geometry/size.h
|
| diff --git a/ui/gfx/geometry/size.h b/ui/gfx/geometry/size.h
|
| index 7f2a9037a498ff8a2244c526a14bddd0f6cd380f..cc5d6aa4525af00adc0e690855f6dde03329474f 100644
|
| --- a/ui/gfx/geometry/size.h
|
| +++ b/ui/gfx/geometry/size.h
|
| @@ -12,14 +12,6 @@
|
| #include "ui/gfx/geometry/size_f.h"
|
| #include "ui/gfx/gfx_export.h"
|
|
|
| -#if defined(OS_WIN)
|
| -typedef struct tagSIZE SIZE;
|
| -#elif defined(OS_IOS)
|
| -#include <CoreGraphics/CoreGraphics.h>
|
| -#elif defined(OS_MACOSX)
|
| -#include <ApplicationServices/ApplicationServices.h>
|
| -#endif
|
| -
|
| namespace gfx {
|
|
|
| // A size has width and height values.
|
| @@ -28,24 +20,8 @@ class GFX_EXPORT Size {
|
| Size() : width_(0), height_(0) {}
|
| Size(int width, int height)
|
| : width_(width < 0 ? 0 : width), height_(height < 0 ? 0 : height) {}
|
| -#if defined(OS_MACOSX)
|
| - explicit Size(const CGSize& s)
|
| - : width_(s.width < 0 ? 0 : s.width),
|
| - height_(s.height < 0 ? 0 : s.height) {}
|
| -#endif
|
| -
|
| ~Size() {}
|
|
|
| -#if defined(OS_MACOSX)
|
| - Size& operator=(const CGSize& s);
|
| -#endif
|
| -
|
| -#if defined(OS_WIN)
|
| - SIZE ToSIZE() const;
|
| -#elif defined(OS_MACOSX)
|
| - CGSize ToCGSize() const { return CGSizeMake(width(), height()); }
|
| -#endif
|
| -
|
| int width() const { return width_; }
|
| int height() const { return height_; }
|
|
|
|
|