| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 BASE_GFX_SIZE_H__ | 5 #ifndef BASE_GFX_SIZE_H__ |
| 6 #define BASE_GFX_SIZE_H__ | 6 #define BASE_GFX_SIZE_H__ |
| 7 | 7 |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 | 9 |
| 10 #ifdef UNIT_TEST | |
| 11 #include <iostream> | 10 #include <iostream> |
| 12 #endif | |
| 13 | 11 |
| 14 #if defined(OS_WIN) | 12 #if defined(OS_WIN) |
| 15 typedef struct tagSIZE SIZE; | 13 typedef struct tagSIZE SIZE; |
| 16 #elif defined(OS_MACOSX) | 14 #elif defined(OS_MACOSX) |
| 17 #include <ApplicationServices/ApplicationServices.h> | 15 #include <ApplicationServices/ApplicationServices.h> |
| 18 #endif | 16 #endif |
| 19 | 17 |
| 20 namespace gfx { | 18 namespace gfx { |
| 21 | 19 |
| 22 // | 20 // |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 CGSize ToCGSize() const; | 61 CGSize ToCGSize() const; |
| 64 #endif | 62 #endif |
| 65 | 63 |
| 66 private: | 64 private: |
| 67 int width_; | 65 int width_; |
| 68 int height_; | 66 int height_; |
| 69 }; | 67 }; |
| 70 | 68 |
| 71 } // namespace gfx | 69 } // namespace gfx |
| 72 | 70 |
| 73 #ifdef UNIT_TEST | |
| 74 | |
| 75 inline std::ostream& operator<<(std::ostream& out, const gfx::Size& s) { | 71 inline std::ostream& operator<<(std::ostream& out, const gfx::Size& s) { |
| 76 return out << s.width() << "x" << s.height(); | 72 return out << s.width() << "x" << s.height(); |
| 77 } | 73 } |
| 78 | 74 |
| 79 #endif // #ifdef UNIT_TEST | |
| 80 | |
| 81 #endif // BASE_GFX_SIZE_H__ | 75 #endif // BASE_GFX_SIZE_H__ |
| 82 | 76 |
| OLD | NEW |