Remove dependency on ui from view_manager.

mojo/aura/window_tree_host_mojo.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/aura/window_tree_host_mojo.h"
 
 #include "mojo/aura/surface_context_factory.h"
+#include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 
 namespace mojo {
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostMojo, public:
 
 WindowTreeHostMojo::WindowTreeHostMojo(Shell* shell, View* view)
-    : view_(view), bounds_(view->bounds()) {
+    : view_(view), bounds_(view->bounds().To<gfx::Rect>()) {
   view_->AddObserver(this);
 
   context_factory_.reset(new SurfaceContextFactory(shell, view_));
   // WindowTreeHost creates the compositor using the ContextFactory from
   // aura::Env. Install |context_factory_| there so that |context_factory_| is
   // picked up.
   ui::ContextFactory* default_context_factory =
       aura::Env::GetInstance()->context_factory();
   aura::Env::GetInstance()->set_context_factory(context_factory_.get());
   CreateCompositor(GetAcceleratedWidget());
@@ skipping 67 matching lines @@
 
 ui::EventProcessor* WindowTreeHostMojo::GetEventProcessor() {
   return dispatcher();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostMojo, ViewObserver implementation:
 
 void WindowTreeHostMojo::OnViewBoundsChanged(
     View* view,
-    const gfx::Rect& old_bounds,
-    const gfx::Rect& new_bounds) {
-  bounds_ = new_bounds;
-  if (old_bounds.origin() != new_bounds.origin())
+    const Rect& old_bounds,
+    const Rect& new_bounds) {
+  gfx::Rect old_bounds2 = old_bounds.To<gfx::Rect>();
+  gfx::Rect new_bounds2 = new_bounds.To<gfx::Rect>();
+  bounds_ = new_bounds2;
+  if (old_bounds2.origin() != new_bounds2.origin())
     OnHostMoved(bounds_.origin());
-  if (old_bounds.size() != new_bounds.size())
+  if (old_bounds2.size() != new_bounds2.size())
     OnHostResized(bounds_.size());
 }
 
 }  // namespace mojo