| 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 "build/build_config.h" | 10 #include "build/build_config.h" |
| 11 #include "ui/base/ui_export.h" | 11 #include "ui/base/ui_export.h" |
| 12 #include "ui/gfx/size_base.h" | 12 #include "ui/gfx/size_base.h" |
| 13 | 13 |
| 14 #if defined(OS_WIN) | 14 #if defined(OS_WIN) |
| 15 typedef struct tagSIZE SIZE; | 15 typedef struct tagSIZE SIZE; |
| 16 #elif defined(OS_IOS) |
| 17 #include <CoreGraphics/CoreGraphics.h> |
| 16 #elif defined(OS_MACOSX) | 18 #elif defined(OS_MACOSX) |
| 17 #include <ApplicationServices/ApplicationServices.h> | 19 #include <ApplicationServices/ApplicationServices.h> |
| 18 #endif | 20 #endif |
| 19 | 21 |
| 20 namespace gfx { | 22 namespace gfx { |
| 21 | 23 |
| 22 // A size has width and height values. | 24 // A size has width and height values. |
| 23 class UI_EXPORT Size : public SizeBase<Size, int> { | 25 class UI_EXPORT Size : public SizeBase<Size, int> { |
| 24 public: | 26 public: |
| 25 Size(); | 27 Size(); |
| (...skipping 17 matching lines...) Expand all Loading... |
| 43 std::string ToString() const; | 45 std::string ToString() const; |
| 44 }; | 46 }; |
| 45 | 47 |
| 46 #if !defined(COMPILER_MSVC) | 48 #if !defined(COMPILER_MSVC) |
| 47 extern template class SizeBase<Size, int>; | 49 extern template class SizeBase<Size, int>; |
| 48 #endif | 50 #endif |
| 49 | 51 |
| 50 } // namespace gfx | 52 } // namespace gfx |
| 51 | 53 |
| 52 #endif // UI_GFX_SIZE_H_ | 54 #endif // UI_GFX_SIZE_H_ |
| OLD | NEW |