| 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_INSETS_H_ | 5 #ifndef UI_GFX_GEOMETRY_INSETS_H_ |
| 6 #define UI_GFX_INSETS_H_ | 6 #define UI_GFX_GEOMETRY_INSETS_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/gfx/geometry/insets_base.h" |
| 11 #include "ui/gfx/gfx_export.h" | 12 #include "ui/gfx/gfx_export.h" |
| 12 #include "ui/gfx/insets_base.h" | |
| 13 | 13 |
| 14 #if defined(TOOLKIT_GTK) | 14 #if defined(TOOLKIT_GTK) |
| 15 typedef struct _GtkBorder GtkBorder; | 15 typedef struct _GtkBorder GtkBorder; |
| 16 #endif | 16 #endif |
| 17 | 17 |
| 18 namespace gfx { | 18 namespace gfx { |
| 19 | 19 |
| 20 // An integer version of gfx::Insets. | 20 // An integer version of gfx::Insets. |
| 21 class GFX_EXPORT Insets : public InsetsBase<Insets, int> { | 21 class GFX_EXPORT Insets : public InsetsBase<Insets, int> { |
| 22 public: | 22 public: |
| (...skipping 19 matching lines...) Expand all Loading... |
| 42 // Returns a string representation of the insets. | 42 // Returns a string representation of the insets. |
| 43 std::string ToString() const; | 43 std::string ToString() const; |
| 44 }; | 44 }; |
| 45 | 45 |
| 46 #if !defined(COMPILER_MSVC) | 46 #if !defined(COMPILER_MSVC) |
| 47 extern template class InsetsBase<Insets, int>; | 47 extern template class InsetsBase<Insets, int>; |
| 48 #endif | 48 #endif |
| 49 | 49 |
| 50 } // namespace gfx | 50 } // namespace gfx |
| 51 | 51 |
| 52 #endif // UI_GFX_INSETS_H_ | 52 #endif // UI_GFX_GEOMETRY_INSETS_H_ |
| OLD | NEW |