Converts client lib to use gfx types

BUG=none
TEST=none
R=ben@chromium.org

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

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

4 files changed, 14 insertions, 22 deletions

diff --git a/ui/views/mus/native_widget_mus.cc b/ui/views/mus/native_widget_mus.cc
index 1e6062e..bdde2ecb 100644
--- a/ui/views/mus/native_widget_mus.cc
+++ b/ui/views/mus/native_widget_mus.cc
@@ -85,8 +85,7 @@ void NativeWidgetMus::UpdateClientAreaInWindowManager() {
   if (!non_client_view || !non_client_view->client_view())
     return;
 
-  window_->SetClientArea(
-      *mojo::Rect::From(non_client_view->client_view()->bounds()));
+  window_->SetClientArea(non_client_view->client_view()->bounds());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -248,9 +247,7 @@ void NativeWidgetMus::SetBounds(const gfx::Rect& bounds) {
 }
 
 void NativeWidgetMus::SetSize(const gfx::Size& size) {
-  gfx::Rect bounds = window_->bounds().To<gfx::Rect>();
-  bounds.set_size(size);
-  window_->RequestBoundsChange(bounds);
+  window_->RequestBoundsChange(gfx::Rect(window_->bounds().size()));
 }
 
 void NativeWidgetMus::StackAbove(gfx::NativeView native_view) {
diff --git a/ui/views/mus/native_widget_view_manager.cc b/ui/views/mus/native_widget_view_manager.cc
index 4f64fe8..e6a0e67 100644
--- a/ui/views/mus/native_widget_view_manager.cc
+++ b/ui/views/mus/native_widget_view_manager.cc
@@ -154,12 +154,9 @@ void NativeWidgetViewManager::SetSize(const gfx::Size& size) {
   NativeWidgetAura::SetSize(size);
   if (!window_manager_)
     return;
-  mojo::RectPtr bounds(mojo::Rect::New());
-  bounds->x = window_->bounds().x;
-  bounds->y = window_->bounds().y;
-  bounds->width = size.width();
-  bounds->height = size.height();
-  window_manager_->SetBounds(window_->id(), bounds.Pass(),
+  gfx::Rect bounds(window_->bounds().x(), window_->bounds().y(), size.width(),
+                   size.height());
+  window_manager_->SetBounds(window_->id(), mojo::Rect::From(bounds),
                              base::Bind(&WindowManagerCallback));
 }
 
diff --git a/ui/views/mus/window_tree_host_mus.cc b/ui/views/mus/window_tree_host_mus.cc
index fd8521f..884274a 100644
--- a/ui/views/mus/window_tree_host_mus.cc
+++ b/ui/views/mus/window_tree_host_mus.cc
@@ -83,7 +83,7 @@ void WindowTreeHostMojo::HideImpl() {
 }
 
 gfx::Rect WindowTreeHostMojo::GetBounds() const {
-  return mus_window_->bounds().To<gfx::Rect>();
+  return mus_window_->bounds();
 }
 
 void WindowTreeHostMojo::SetBounds(const gfx::Rect& bounds) {
@@ -118,14 +118,12 @@ void WindowTreeHostMojo::OnCursorVisibilityChangedNative(bool show) {
 // WindowTreeHostMojo, WindowObserver implementation:
 
 void WindowTreeHostMojo::OnWindowBoundsChanged(mus::Window* window,
-                                               const mojo::Rect& old_bounds,
-                                               const mojo::Rect& new_bounds) {
-  gfx::Rect old_bounds2 = old_bounds.To<gfx::Rect>();
-  gfx::Rect new_bounds2 = new_bounds.To<gfx::Rect>();
-  if (old_bounds2.origin() != new_bounds2.origin())
-    OnHostMoved(new_bounds2.origin());
-  if (old_bounds2.size() != new_bounds2.size())
-    OnHostResized(new_bounds2.size());
+                                               const gfx::Rect& old_bounds,
+                                               const gfx::Rect& new_bounds) {
+  if (old_bounds.origin() != new_bounds.origin())
+    OnHostMoved(new_bounds.origin());
+  if (old_bounds.size() != new_bounds.size())
+    OnHostResized(new_bounds.size());
 }
 
 void WindowTreeHostMojo::OnWindowFocusChanged(mus::Window* gained_focus,
diff --git a/ui/views/mus/window_tree_host_mus.h b/ui/views/mus/window_tree_host_mus.h
index 612b886..246ddb7 100644
--- a/ui/views/mus/window_tree_host_mus.h
+++ b/ui/views/mus/window_tree_host_mus.h
@@ -59,8 +59,8 @@ class WindowTreeHostMojo : public aura::WindowTreeHost,
 
   // mus::WindowObserver:
   void OnWindowBoundsChanged(mus::Window* window,
-                             const mojo::Rect& old_bounds,
-                             const mojo::Rect& new_bounds) override;
+                             const gfx::Rect& old_bounds,
+                             const gfx::Rect& new_bounds) override;
   void OnWindowFocusChanged(mus::Window* gained_focus,
                             mus::Window* lost_focus) override;
   void OnWindowInputEvent(mus::Window* view,