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

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

Issue 1092033006: [Mac/Cleanup] Trim down Foundation.h and ApplicationServices.h includes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: include -> import Created 5 years, 8 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.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 74857c521e27d18c5ea61f57798958f4a46f1309..7c0b8cf8ff8930d2c3e42cc4be5eab9fec3d3b56 100644
--- a/ui/gfx/geometry/size.h
+++ b/ui/gfx/geometry/size.h
@@ -14,10 +14,8 @@
#if defined(OS_WIN)
typedef struct tagSIZE SIZE;
-#elif defined(OS_IOS)
-#include <CoreGraphics/CoreGraphics.h>
#elif defined(OS_MACOSX)
-#include <ApplicationServices/ApplicationServices.h>
+typedef struct CGSize CGSize;
#endif
namespace gfx {
@@ -29,9 +27,7 @@ class GFX_EXPORT Size {
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) {}
+ explicit Size(const CGSize& s);
#endif
~Size() {}
@@ -43,7 +39,7 @@ class GFX_EXPORT Size {
#if defined(OS_WIN)
SIZE ToSIZE() const;
#elif defined(OS_MACOSX)
- CGSize ToCGSize() const { return CGSizeMake(width(), height()); }
+ CGSize ToCGSize() const;
#endif
int width() const { return width_; }
« no previous file with comments | « ui/gfx/geometry/rect.cc ('k') | ui/gfx/geometry/size.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698