Get mojo_shell building inside chromium checkout.

This brings in mojo_shell and the necessary services to make html_viewer work.

This is copied from the Mojo repo at 272fbba5887d66fc0111e2ab44c1edf67b7f23e0.

R=scottmg@chromium.org

Review URL: https://codereview.chromium.org/1049993002

Cr-Commit-Position: refs/heads/master@{#323528}

2 files changed, 24 insertions, 0 deletions

diff --git a/mojo/converters/geometry/geometry_type_converters.cc b/mojo/converters/geometry/geometry_type_converters.cc
index ea9166d..fb17e03 100644
--- a/mojo/converters/geometry/geometry_type_converters.cc
+++ b/mojo/converters/geometry/geometry_type_converters.cc
@@ -87,4 +87,19 @@ gfx::RectF TypeConverter<gfx::RectF, RectFPtr>::Convert(const RectFPtr& input) {
   return gfx::RectF(input->x, input->y, input->width, input->height);
 }
 
+// static
+Rect TypeConverter<Rect, gfx::Rect>::Convert(const gfx::Rect& input) {
+  Rect rect;
+  rect.x = input.x();
+  rect.y = input.y();
+  rect.width = input.width();
+  rect.height = input.height();
+  return rect;
+}
+
+// static
+gfx::Rect TypeConverter<gfx::Rect, Rect>::Convert(const Rect& input) {
+  return gfx::Rect(input.x, input.y, input.width, input.height);
+}
+
 }  // namespace mojo
diff --git a/mojo/converters/geometry/geometry_type_converters.h b/mojo/converters/geometry/geometry_type_converters.h
index 2d906c1..cb2a6b8 100644
--- a/mojo/converters/geometry/geometry_type_converters.h
+++ b/mojo/converters/geometry/geometry_type_converters.h
@@ -59,6 +59,15 @@ struct MOJO_GEOMETRY_EXPORT TypeConverter<gfx::RectF, RectFPtr> {
   static gfx::RectF Convert(const RectFPtr& input);
 };
 
+template <>
+struct MOJO_GEOMETRY_EXPORT TypeConverter<Rect, gfx::Rect> {
+  static Rect Convert(const gfx::Rect& input);
+};
+template <>
+struct MOJO_GEOMETRY_EXPORT TypeConverter<gfx::Rect, Rect> {
+  static gfx::Rect Convert(const Rect& input);
+};
+
 }  // namespace mojo
 
 #endif  // MOJO_CONVERTERS_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_