Remove dependency on ui from view_manager.

mojo/services/public/cpp/view_manager/view.h

 // 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.
 
 #ifndef MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_H_
 #define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/services/public/cpp/view_manager/types.h"
+#include "mojo/services/public/interfaces/geometry/geometry.mojom.h"
 #include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager_constants.mojom.h"
-#include "ui/gfx/geometry/rect.h"
 
 namespace mojo {
 
 class ServiceProviderImpl;
 class View;
 class ViewManager;
 class ViewObserver;
 
 // Views are owned by the ViewManager.
 // TODO(beng): Right now, you'll have to implement a ViewObserver to track
 //             destruction and NULL any pointers you have.
 //             Investigate some kind of smart pointer or weak pointer for these.
 class View {
  public:
   typedef std::vector<View*> Children;
 
   static View* Create(ViewManager* view_manager);
 
   // Destroys this view and all its children.
   void Destroy();
 
   ViewManager* view_manager() { return manager_; }
 
   // Configuration.
   Id id() const { return id_; }
 
   // Geometric disposition.
-  const gfx::Rect& bounds() const { return bounds_; }
-  void SetBounds(const gfx::Rect& bounds);
+  const Rect& bounds() const { return bounds_; }
+  void SetBounds(const Rect& bounds);
 
   // Visibility (also see IsDrawn()).
   bool visible() const { return visible_; }
   void SetVisible(bool value);
 
   // A View is drawn if the View and all its ancestors are visible and the
   // View is attached to the root.
   bool IsDrawn() const;
 
   // Observation.
@@ skipping 36 matching lines @@
   friend class ViewPrivate;
   friend class ViewManagerClientImpl;
 
   explicit View(ViewManager* manager);
 
   void LocalDestroy();
   void LocalAddChild(View* child);
   void LocalRemoveChild(View* child);
   // Returns true if the order actually changed.
   bool LocalReorder(View* relative, OrderDirection direction);
-  void LocalSetBounds(const gfx::Rect& old_bounds, const gfx::Rect& new_bounds);
+  void LocalSetBounds(const Rect& old_bounds, const Rect& new_bounds);
   void LocalSetDrawn(bool drawn);
 
   ViewManager* manager_;
   Id id_;
   View* parent_;
   Children children_;
 
   ObserverList<ViewObserver> observers_;
 
-  gfx::Rect bounds_;
+  Rect bounds_;
 
   bool visible_;
 
   // Drawn state is derived from the visible state and the parent's visible
   // state. This field is only used if the view has no parent (eg it's a root).
   bool drawn_;
 
   DISALLOW_COPY_AND_ASSIGN(View);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_H_