Remove dependency on ui from view_manager.

mojo/services/window_manager/window_manager_app.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/services/window_manager/window_manager_app.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "mojo/aura/aura_init.h"
+#include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_property.h"
 #include "ui/base/hit_test.h"
@@ skipping 152 matching lines @@
 
 void WindowManagerApp::OnEmbed(ViewManager* view_manager,
                                View* root,
                                ServiceProviderImpl* exported_services,
                                scoped_ptr<ServiceProvider> imported_services) {
   DCHECK(!view_manager_ && !root_);
   view_manager_ = view_manager;
   root_ = root;
 
   window_tree_host_.reset(new WindowTreeHostMojo(shell_, root_));
-  window_tree_host_->window()->SetBounds(root->bounds());
+  window_tree_host_->window()->SetBounds(
+      root->bounds().Clone().To<gfx::Rect>());
   window_tree_host_->window()->Show();
 
   RegisterSubtree(root_, window_tree_host_->window());
 
   capture_client_.reset(
       new wm::ScopedCaptureClient(window_tree_host_->window()));
 
   if (wrapped_view_manager_delegate_) {
     wrapped_view_manager_delegate_->OnEmbed(
         view_manager, root, exported_services, imported_services.Pass());
@@ skipping 48 matching lines @@
   root_ = NULL;
   STLDeleteValues(&view_id_to_window_map_);
   if (focus_client_.get())
     focus_client_->RemoveObserver(this);
   if (activation_client_)
     activation_client_->RemoveObserver(this);
   window_tree_host_.reset();
 }
 
 void WindowManagerApp::OnViewBoundsChanged(View* view,
-                                           const gfx::Rect& old_bounds,
-                                           const gfx::Rect& new_bounds) {
+                                           const Rect& old_bounds,
+                                           const Rect& new_bounds) {
   aura::Window* window = GetWindowForViewId(view->id());
-  window->SetBounds(new_bounds);
+  window->SetBounds(new_bounds.Clone().To<gfx::Rect>());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, ui::EventHandler implementation:
 
 void WindowManagerApp::OnEvent(ui::Event* event) {
   if (!window_manager_client_)
     return;
 
   View* view = GetViewForWindow(static_cast<aura::Window*>(event->target()));
@@ skipping 40 matching lines @@
   DCHECK(view_id_to_window_map_.find(view->id()) ==
          view_id_to_window_map_.end());
   aura::Window* window = new aura::Window(dummy_delegate_.get());
   window->set_id(view->id());
   window->SetProperty(kViewKey, view);
   // All events pass through the root during dispatch, so we only need a handler
   // installed there.
   if (view == root_)
     window->AddPreTargetHandler(this);
   parent->AddChild(window);
-  window->SetBounds(view->bounds());
+  window->SetBounds(view->bounds().Clone().To<gfx::Rect>());
   window->Show();
   view_id_to_window_map_[view->id()] = window;
   View::Children::const_iterator it = view->children().begin();
   for (; it != view->children().end(); ++it)
     RegisterSubtree(*it, window);
 }
 
 void WindowManagerApp::UnregisterSubtree(View* view) {
   for (View* child : view->children())
     UnregisterSubtree(child);
   Unregister(view);
 }
 
 void WindowManagerApp::Unregister(View* view) {
   ViewIdToWindowMap::iterator it = view_id_to_window_map_.find(view->id());
   if (it == view_id_to_window_map_.end()) {
     // Because we unregister in OnViewDestroying() we can still get a subsequent
     // OnTreeChanged for the same view. Ignore this one.
     return;
   }
   view->RemoveObserver(this);
   DCHECK(it != view_id_to_window_map_.end());
   // Delete before we remove from map as destruction may want to look up view
   // for window.
   delete it->second;
   view_id_to_window_map_.erase(it);
 }
 
 }  // namespace mojo