| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef UI_GFX_SIZE_H_ | 5 #ifndef UI_GFX_SIZE_H_ |
| 6 #define UI_GFX_SIZE_H_ | 6 #define UI_GFX_SIZE_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| 11 #include "ui/gfx/gfx_export.h" | 11 #include "ui/gfx/gfx_export.h" |
| 12 #include "ui/gfx/size_base.h" | 12 #include "ui/gfx/size_base.h" |
| 13 #include "ui/gfx/size_f.h" | 13 #include "ui/gfx/size_f.h" |
| 14 | 14 |
| 15 #if defined(OS_WIN) | 15 #if defined(OS_WIN) |
| 16 typedef struct tagSIZE SIZE; | 16 typedef struct tagSIZE SIZE; |
| 17 #elif defined(OS_IOS) | 17 #elif defined(OS_IOS) |
| 18 #include <CoreGraphics/CoreGraphics.h> | 18 #include <CoreGraphics/CoreGraphics.h> |
| 19 #elif defined(OS_MACOSX) | 19 #elif defined(OS_MACOSX) |
| 20 #include <ApplicationServices/ApplicationServices.h> | 20 #include <ApplicationServices/ApplicationServices.h> |
| 21 #endif | 21 #endif |
| 22 | 22 |
| 23 namespace gfx { | 23 namespace gfx { |
| 24 | 24 |
| 25 // A size has width and height values. | 25 // A size has width and height values. |
| 26 class UI_EXPORT Size : public SizeBase<Size, int> { | 26 class GFX_EXPORT Size : public SizeBase<Size, int> { |
| 27 public: | 27 public: |
| 28 Size() : SizeBase<Size, int>(0, 0) {} | 28 Size() : SizeBase<Size, int>(0, 0) {} |
| 29 Size(int width, int height) : SizeBase<Size, int>(width, height) {} | 29 Size(int width, int height) : SizeBase<Size, int>(width, height) {} |
| 30 #if defined(OS_MACOSX) | 30 #if defined(OS_MACOSX) |
| 31 explicit Size(const CGSize& s); | 31 explicit Size(const CGSize& s); |
| 32 #endif | 32 #endif |
| 33 | 33 |
| 34 ~Size() {} | 34 ~Size() {} |
| 35 | 35 |
| 36 #if defined(OS_MACOSX) | 36 #if defined(OS_MACOSX) |
| (...skipping 21 matching lines...) Expand all Loading... |
| 58 return !(lhs == rhs); | 58 return !(lhs == rhs); |
| 59 } | 59 } |
| 60 | 60 |
| 61 #if !defined(COMPILER_MSVC) | 61 #if !defined(COMPILER_MSVC) |
| 62 extern template class SizeBase<Size, int>; | 62 extern template class SizeBase<Size, int>; |
| 63 #endif | 63 #endif |
| 64 | 64 |
| 65 } // namespace gfx | 65 } // namespace gfx |
| 66 | 66 |
| 67 #endif // UI_GFX_SIZE_H_ | 67 #endif // UI_GFX_SIZE_H_ |
| OLD | NEW |