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

Unified Diff: ui/gfx/geometry/size.h

Issue 1061733002: Remove windows/mac/ios specific code from //ui (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: fix default try set Created 5 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
« no previous file with comments | « ui/gfx/geometry/rect_unittest.cc ('k') | ui/gfx/geometry/size.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_; }
« no previous file with comments | « ui/gfx/geometry/rect_unittest.cc ('k') | ui/gfx/geometry/size.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698