Fix build.

R=esprehn@chromium.org

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

tools/debugger/debugger.cc

@@ -85,8 +85,8 @@ class SkyDebugger : public mojo::ApplicationDelegate,
   }
 
   virtual void OnViewBoundsChanged(mojo::View* view,
-                                   const gfx::Rect& old_bounds,
-                                   const gfx::Rect& new_bounds) override {
+                                   const mojo::Rect& old_bounds,
+                                   const mojo::Rect& new_bounds) override {
     content_->SetBounds(new_bounds);
   }
 

tools/tester/tester.cc

@@ -77,8 +77,8 @@ class SkyTester : public mojo::ApplicationDelegate,
   }
 
   virtual void OnViewBoundsChanged(mojo::View* view,
-                                   const gfx::Rect& old_bounds,
-                                   const gfx::Rect& new_bounds) override {
+                                   const mojo::Rect& old_bounds,
+                                   const mojo::Rect& new_bounds) override {
     content_->SetBounds(new_bounds);
   }
 

viewer/BUILD.gn

@@ -47,6 +47,7 @@ shared_library("viewer") {
     "//mojo/bindings/js",
     "//mojo/cc",
     "//mojo/common",
+    "//mojo/converters/geometry",
     "//mojo/public/c/system:for_shared_library",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/utility",

viewer/DEPS

 include_rules = [
   "+cc",
-  "+mojo/cc",
   "+mojo/application",
+  "+mojo/cc",
+  "+mojo/converters/geometry",
   "+mojo/services",
   "+net/base",
   "+skia",

viewer/document_view.cc

@@ -10,6 +10,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
+#include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/cpp/system/data_pipe.h"
@@ -104,8 +105,9 @@ void DocumentView::OnEmbed(
 
   Load(response_.Pass());
 
-  web_view_->resize(root_->bounds().size());
-  web_layer_tree_view_impl_->setViewportSize(root_->bounds().size());
+  gfx::Size size = root_->bounds().To<gfx::Rect>().size();
+  web_view_->resize(size);
+  web_layer_tree_view_impl_->setViewportSize(size);
   web_layer_tree_view_impl_->set_view(root_);
   root_->AddObserver(this);
 }
@@ -179,11 +181,12 @@ void DocumentView::didCreateScriptContext(blink::WebLocalFrame* frame,
 }
 
 void DocumentView::OnViewBoundsChanged(mojo::View* view,
-                                       const gfx::Rect& old_bounds,
-                                       const gfx::Rect& new_bounds) {
+                                       const mojo::Rect& old_bounds,
+                                       const mojo::Rect& new_bounds) {
   DCHECK_EQ(view, root_);
-  web_view_->resize(new_bounds.size());
-  web_layer_tree_view_impl_->setViewportSize(new_bounds.size());
+  gfx::Size size = new_bounds.To<gfx::Rect>().size();
+  web_view_->resize(size);
+  web_layer_tree_view_impl_->setViewportSize(size);
 }
 
 void DocumentView::OnViewDestroyed(mojo::View* view) {

viewer/document_view.h

@@ -84,8 +84,8 @@ class DocumentView : public blink::WebViewClient,
 
   // ViewObserver methods:
   virtual void OnViewBoundsChanged(mojo::View* view,
-                                   const gfx::Rect& old_bounds,
-                                   const gfx::Rect& new_bounds) override;
+                                   const mojo::Rect& old_bounds,
+                                   const mojo::Rect& new_bounds) override;
   virtual void OnViewDestroyed(mojo::View* view) override;
   virtual void OnViewInputEvent(mojo::View* view, const mojo::EventPtr& event) override;