| Index: mojo/services/view_manager/public/cpp/view.h
|
| diff --git a/mojo/services/view_manager/public/cpp/view.h b/mojo/services/view_manager/public/cpp/view.h
|
| index 3222b330f08bd5dc2de26a09ee5210596ebc68bd..9917fca48247d3e394e8517b24266e69739ba19e 100644
|
| --- a/mojo/services/view_manager/public/cpp/view.h
|
| +++ b/mojo/services/view_manager/public/cpp/view.h
|
| @@ -9,12 +9,13 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/observer_list.h"
|
| +#include "geometry/public/interfaces/geometry.mojom.h"
|
| #include "mojo/public/cpp/bindings/array.h"
|
| #include "mojo/public/interfaces/application/service_provider.mojom.h"
|
| -#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
|
| -#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
|
| -#include "mojo/services/view_manager/public/cpp/types.h"
|
| -#include "mojo/services/view_manager/public/interfaces/view_manager_constants.mojom.h"
|
| +#include "surfaces/public/interfaces/surface_id.mojom.h"
|
| +#include "view_manager/public/cpp/types.h"
|
| +#include "view_manager/public/interfaces/view_manager.mojom.h"
|
| +#include "view_manager/public/interfaces/view_manager_constants.mojom.h"
|
|
|
| namespace mojo {
|
|
|
| @@ -52,6 +53,8 @@ class View {
|
| bool visible() const { return visible_; }
|
| void SetVisible(bool value);
|
|
|
| + const ViewportMetrics& viewport_metrics() { return *viewport_metrics_; }
|
| +
|
| // Returns the set of string to bag of byte properties. These properties are
|
| // shared with the view manager.
|
| const SharedProperties& shared_properties() const { return properties_; }
|
| @@ -172,6 +175,7 @@ class View {
|
| ObserverList<ViewObserver> observers_;
|
|
|
| Rect bounds_;
|
| + ViewportMetricsPtr viewport_metrics_;
|
|
|
| bool visible_;
|
|
|
|
|