Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8

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"
@@ skipping 16 matching lines @@
 template <typename T>
 struct ViewProperty;
 
 // 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:
   using Children = std::vector<View*>;
-
-  // Creates and returns a new View (which is owned by the ViewManager). Views
-  // are initially hidden, use SetVisible(true) to show.
-  static View* Create(ViewManager* view_manager);
+  using SharedProperties = std::map<std::string, std::vector<uint8_t>>;
 
   // Destroys this view and all its children.
   void Destroy();
 
   ViewManager* view_manager() { return manager_; }
 
   // Configuration.
   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);
 
   // Returns the set of string to bag of byte properties. These properties are
   // shared with the view manager.
-  const std::map<std::string, std::vector<uint8_t>>& shared_properties() const {
-    return properties_;
-  }
+  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.
   //
   // These properties are not visible to the view manager.
   template <typename T>
@@ skipping 23 matching lines @@
   bool IsDrawn() const;
 
   // Observation.
   void AddObserver(ViewObserver* observer);
   void RemoveObserver(ViewObserver* observer);
 
   // Tree.
   View* parent() { return parent_; }
   const View* parent() const { return parent_; }
   const Children& children() const { return children_; }
+  View* GetRoot() {
+    return const_cast<View*>(const_cast<const View*>(this)->GetRoot());
+  }
   const View* GetRoot() const;
 
   void AddChild(View* child);
   void RemoveChild(View* child);
 
   void Reorder(View* relative, OrderDirection direction);
   void MoveToFront();
   void MoveToBack();
 
   bool Contains(View* child) const;
@@ skipping 13 matching lines @@
 
  protected:
   // This class is subclassed only by test classes that provide a public ctor.
   View();
   ~View();
 
  private:
   friend class ViewPrivate;
   friend class ViewManagerClientImpl;
 
-  explicit View(ViewManager* manager);
+  View(ViewManager* manager, Id id);
 
   // Called by the public {Set,Get,Clear}Property functions.
   int64 SetLocalPropertyInternal(const void* key,
                                  const char* name,
                                  PropertyDeallocator deallocator,
                                  int64 value,
                                  int64 default_value);
   int64 GetLocalPropertyInternal(const void* key, int64 default_value) const;
 
   void LocalDestroy();
@@ skipping 20 matching lines @@
   Id id_;
   View* parent_;
   Children children_;
 
   ObserverList<ViewObserver> observers_;
 
   Rect bounds_;
 
   bool visible_;
 
-  std::map<std::string, std::vector<uint8_t>> properties_;
+  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_