Update mojo sdk to rev 9fbbc4f0fef1187312316c0ed992342474e139f1

mojo/services/view_manager/public/cpp/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_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
 #define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
 
 #include <vector>
 
 #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 {
 
 class ServiceProviderImpl;
 class View;
 class ViewManager;
 class ViewObserver;
 
 // Defined in view_property.h (which we do not include)
 template <typename T>
@@ skipping 17 matching lines @@
   Id id() const { return id_; }
 
   // Geometric disposition.
   const Rect& bounds() const { return bounds_; }
   void SetBounds(const Rect& bounds);
 
   // Visibility (also see IsDrawn()). When created views are hidden.
   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_; }
   // Sets a property. If |data| is null, this property is deleted.
   void SetSharedProperty(const std::string& name,
                          const std::vector<uint8_t>* data);
 
   // Sets the |value| of the given window |property|. Setting to the default
   // value (e.g., NULL) removes the property. The caller is responsible for the
   // lifetime of any object set as a property on the View.
@@ skipping 100 matching lines @@
   void NotifyViewVisibilityChangedUp(View* target);
 
   ViewManager* manager_;
   Id id_;
   View* parent_;
   Children children_;
 
   ObserverList<ViewObserver> observers_;
 
   Rect bounds_;
+  ViewportMetricsPtr viewport_metrics_;
 
   bool visible_;
 
   SharedProperties properties_;
 
   // 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_;
 
   // Value struct to keep the name and deallocator for this property.
   // Key cannot be used for this purpose because it can be char* or
   // WindowProperty<>.
   struct Value {
     const char* name;
     int64 value;
     PropertyDeallocator deallocator;
   };
 
   std::map<const void*, Value> prop_map_;
 
   DISALLOW_COPY_AND_ASSIGN(View);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_