Allow building mojo_shell and non-graphical apps/services on a Mac

services/view_manager/view_manager_service_impl.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 "services/view_manager/view_manager_service_impl.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/services/window_manager/public/interfaces/window_manager_internal.mojom.h"
 #include "services/view_manager/connection_manager.h"
 #include "services/view_manager/default_access_policy.h"
 #include "services/view_manager/display_manager.h"
 #include "services/view_manager/server_view.h"
 #include "services/view_manager/window_manager_access_policy.h"
 
 using mojo::Array;
 using mojo::Callback;
 using mojo::Id;
 using mojo::InterfaceRequest;
 using mojo::OrderDirection;
-using mojo::Rect;
 using mojo::ServiceProvider;
 using mojo::ServiceProviderPtr;
 using mojo::String;
 using mojo::ViewDataPtr;
 
 namespace view_manager {
 
 ViewManagerServiceImpl::ViewManagerServiceImpl(
     ConnectionManager* connection_manager,
     mojo::ConnectionSpecificId creator_id,
@@ skipping 126 matching lines @@
 }
 
 void ViewManagerServiceImpl::ProcessViewBoundsChanged(
     const ServerView* view,
     const gfx::Rect& old_bounds,
     const gfx::Rect& new_bounds,
     bool originated_change) {
   if (originated_change || !IsViewKnown(view))
     return;
   client()->OnViewBoundsChanged(ViewIdToTransportId(view->id()),
-                                Rect::From(old_bounds),
-                                Rect::From(new_bounds));
+                                mojo::Rect::From(old_bounds),
+                                mojo::Rect::From(new_bounds));
 }
 
 void ViewManagerServiceImpl::ProcessViewportMetricsChanged(
     const mojo::ViewportMetrics& old_metrics,
     const mojo::ViewportMetrics& new_metrics,
     bool originated_change) {
   client()->OnViewViewportMetricsChanged(old_metrics.Clone(),
                                          new_metrics.Clone());
 }
 
@@ skipping 226 matching lines @@
 ViewDataPtr ViewManagerServiceImpl::ViewToViewData(const ServerView* view) {
   DCHECK(IsViewKnown(view));
   const ServerView* parent = view->parent();
   // If the parent isn't known, it means the parent is not visible to us (not
   // in roots), and should not be sent over.
   if (parent && !IsViewKnown(parent))
     parent = NULL;
   ViewDataPtr view_data(mojo::ViewData::New());
   view_data->parent_id = ViewIdToTransportId(parent ? parent->id() : ViewId());
   view_data->view_id = ViewIdToTransportId(view->id());
-  view_data->bounds = Rect::From(view->bounds());
+  view_data->bounds = mojo::Rect::From(view->bounds());
   view_data->properties =
       mojo::Map<String, Array<uint8_t>>::From(view->properties());
   view_data->visible = view->visible();
   view_data->drawn = view->IsDrawn(connection_manager_->root());
   view_data->viewport_metrics =
       connection_manager_->display_manager()->GetViewportMetrics().Clone();
   return view_data.Pass();
 }
 
 void ViewManagerServiceImpl::GetViewTreeImpl(
@@ skipping 215 matching lines @@
 }
 
 bool ViewManagerServiceImpl::IsViewRootOfAnotherConnectionForAccessPolicy(
     const ServerView* view) const {
   ViewManagerServiceImpl* connection =
       connection_manager_->GetConnectionWithRoot(view->id());
   return connection && connection != this;
 }
 
 }  // namespace view_manager