Index: mojo/services/public/cpp/view_manager/view.h |
diff --git a/mojo/services/public/cpp/view_manager/view.h b/mojo/services/public/cpp/view_manager/view.h |
index a7161ea58f686e0b2d6b70ca682145fd07a23bb6..405018a00bd63d3e637ea0dd54aea02dc128d4ad 100644 |
--- a/mojo/services/public/cpp/view_manager/view.h |
+++ b/mojo/services/public/cpp/view_manager/view.h |
@@ -12,9 +12,9 @@ |
#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 { |
@@ -42,8 +42,8 @@ class View { |
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_; } |
@@ -100,7 +100,7 @@ class View { |
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_; |
@@ -110,7 +110,7 @@ class View { |
ObserverList<ViewObserver> observers_; |
- gfx::Rect bounds_; |
+ Rect bounds_; |
bool visible_; |