| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 | 22 |
| 23 // A size has width and height values. | 23 // A size has width and height values. |
| 24 class UI_EXPORT Size : public SizeBase<Size, int> { | 24 class UI_EXPORT Size : public SizeBase<Size, int> { |
| 25 public: | 25 public: |
| 26 Size(); | 26 Size(); |
| 27 Size(int width, int height); | 27 Size(int width, int height); |
| 28 #if defined(OS_MACOSX) | 28 #if defined(OS_MACOSX) |
| 29 explicit Size(const CGSize& s); | 29 explicit Size(const CGSize& s); |
| 30 #endif | 30 #endif |
| 31 | 31 |
| 32 virtual ~Size(); | 32 ~Size(); |
| 33 | 33 |
| 34 #if defined(OS_MACOSX) | 34 #if defined(OS_MACOSX) |
| 35 Size& operator=(const CGSize& s); | 35 Size& operator=(const CGSize& s); |
| 36 #endif | 36 #endif |
| 37 | 37 |
| 38 #if defined(OS_WIN) | 38 #if defined(OS_WIN) |
| 39 SIZE ToSIZE() const; | 39 SIZE ToSIZE() const; |
| 40 #elif defined(OS_MACOSX) | 40 #elif defined(OS_MACOSX) |
| 41 CGSize ToCGSize() const; | 41 CGSize ToCGSize() const; |
| 42 #endif | 42 #endif |
| 43 | 43 |
| 44 std::string ToString() const; | 44 std::string ToString() const; |
| 45 }; | 45 }; |
| 46 | 46 |
| 47 } // namespace gfx | 47 } // namespace gfx |
| 48 | 48 |
| 49 #endif // UI_GFX_SIZE_H_ | 49 #endif // UI_GFX_SIZE_H_ |
| OLD | NEW |