Index: mojo/converters/geometry_type_converters.h |
diff --git a/mojo/services/public/cpp/geometry/geometry_type_converters.h b/mojo/converters/geometry_type_converters.h |
similarity index 54% |
rename from mojo/services/public/cpp/geometry/geometry_type_converters.h |
rename to mojo/converters/geometry_type_converters.h |
index 2f2cc1bcc39f6f180732867d3081631d09e32a55..7105911a51b794dbad9104696b6ce979e6a4c511 100644 |
--- a/mojo/services/public/cpp/geometry/geometry_type_converters.h |
+++ b/mojo/converters/geometry_type_converters.h |
@@ -2,10 +2,10 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef MOJO_SERVICES_PUBLIC_CPP_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_ |
-#define MOJO_SERVICES_PUBLIC_CPP_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_ |
+#ifndef MOJO_CONVERTERS_GEOMETRY_TYPE_CONVERTERS_H_ |
+#define MOJO_CONVERTERS_GEOMETRY_TYPE_CONVERTERS_H_ |
-#include "mojo/services/public/cpp/geometry/mojo_geometry_export.h" |
+#include "mojo/converters/mojo_converters_export.h" |
#include "mojo/services/public/interfaces/geometry/geometry.mojom.h" |
#include "ui/gfx/geometry/point.h" |
#include "ui/gfx/geometry/point_f.h" |
@@ -16,59 +16,59 @@ |
namespace mojo { |
template <> |
-struct MOJO_GEOMETRY_EXPORT TypeConverter<PointPtr, gfx::Point> { |
+struct MOJO_CONVERTERS_EXPORT TypeConverter<PointPtr, gfx::Point> { |
static PointPtr Convert(const gfx::Point& input); |
}; |
template <> |
-struct MOJO_GEOMETRY_EXPORT TypeConverter<gfx::Point, PointPtr> { |
+struct MOJO_CONVERTERS_EXPORT TypeConverter<gfx::Point, PointPtr> { |
static gfx::Point Convert(const PointPtr& input); |
}; |
template <> |
-struct MOJO_GEOMETRY_EXPORT TypeConverter<PointFPtr, gfx::PointF> { |
+struct MOJO_CONVERTERS_EXPORT TypeConverter<PointFPtr, gfx::PointF> { |
static PointFPtr Convert(const gfx::PointF& input); |
}; |
template <> |
-struct MOJO_GEOMETRY_EXPORT TypeConverter<gfx::PointF, PointFPtr> { |
+struct MOJO_CONVERTERS_EXPORT TypeConverter<gfx::PointF, PointFPtr> { |
static gfx::PointF Convert(const PointFPtr& input); |
}; |
template <> |
-struct MOJO_GEOMETRY_EXPORT TypeConverter<SizePtr, gfx::Size> { |
+struct MOJO_CONVERTERS_EXPORT TypeConverter<SizePtr, gfx::Size> { |
static SizePtr Convert(const gfx::Size& input); |
}; |
template <> |
-struct MOJO_GEOMETRY_EXPORT TypeConverter<gfx::Size, SizePtr> { |
+struct MOJO_CONVERTERS_EXPORT TypeConverter<gfx::Size, SizePtr> { |
static gfx::Size Convert(const SizePtr& input); |
}; |
template <> |
-struct MOJO_GEOMETRY_EXPORT TypeConverter<RectPtr, gfx::Rect> { |
+struct MOJO_CONVERTERS_EXPORT TypeConverter<RectPtr, gfx::Rect> { |
static RectPtr Convert(const gfx::Rect& input); |
}; |
template <> |
-struct MOJO_GEOMETRY_EXPORT TypeConverter<gfx::Rect, RectPtr> { |
+struct MOJO_CONVERTERS_EXPORT TypeConverter<gfx::Rect, RectPtr> { |
static gfx::Rect Convert(const RectPtr& input); |
}; |
template <> |
-struct MOJO_GEOMETRY_EXPORT TypeConverter<RectFPtr, gfx::RectF> { |
+struct MOJO_CONVERTERS_EXPORT TypeConverter<RectFPtr, gfx::RectF> { |
static RectFPtr Convert(const gfx::RectF& input); |
}; |
template <> |
-struct MOJO_GEOMETRY_EXPORT TypeConverter<gfx::RectF, RectFPtr> { |
+struct MOJO_CONVERTERS_EXPORT TypeConverter<gfx::RectF, RectFPtr> { |
static gfx::RectF Convert(const RectFPtr& input); |
}; |
template <> |
-struct MOJO_GEOMETRY_EXPORT TypeConverter<TransformPtr, gfx::Transform> { |
+struct MOJO_CONVERTERS_EXPORT TypeConverter<TransformPtr, gfx::Transform> { |
static TransformPtr Convert(const gfx::Transform& input); |
}; |
template <> |
-struct MOJO_GEOMETRY_EXPORT TypeConverter<gfx::Transform, TransformPtr> { |
+struct MOJO_CONVERTERS_EXPORT TypeConverter<gfx::Transform, TransformPtr> { |
static gfx::Transform Convert(const TransformPtr& input); |
}; |
} // namespace mojo |
-#endif // MOJO_SERVICES_PUBLIC_CPP_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_ |
+#endif // MOJO_CONVERTERS_GEOMETRY_TYPE_CONVERTERS_H_ |