| Index: ui/aura/mus/property_converter.h
|
| diff --git a/ui/aura/mus/property_converter.h b/ui/aura/mus/property_converter.h
|
| index 68222213bb5df317bd33f64f5e146c263f66ab86..dbe10850fff633f37a5b4fdfb9500a3eac2a3c59 100644
|
| --- a/ui/aura/mus/property_converter.h
|
| +++ b/ui/aura/mus/property_converter.h
|
| @@ -36,6 +36,10 @@ class AURA_EXPORT PropertyConverter {
|
| PropertyConverter();
|
| ~PropertyConverter();
|
|
|
| + // Returns true if RegisterProperty() has been called with the specified
|
| + // transport name.
|
| + bool IsTransportNameRegistered(const std::string& name) const;
|
| +
|
| // Maps a property on the Window to a property pushed to the server. Return
|
| // true if the property should be sent to the server, false if the property
|
| // is only used locally.
|
| @@ -73,8 +77,10 @@ class AURA_EXPORT PropertyConverter {
|
| PrimitiveProperty primitive_property;
|
| primitive_property.property_name = property->name;
|
| primitive_property.transport_name = transport_name;
|
| - primitive_property.default_value = property->default_value;
|
| + primitive_property.default_value =
|
| + ui::ClassPropertyCaster<T>::ToInt64(property->default_value);
|
| primitive_properties_[property] = primitive_property;
|
| + transport_names_.insert(transport_name);
|
| }
|
|
|
| // Specializations for properties to pointer types supporting mojo conversion.
|
| @@ -114,6 +120,9 @@ class AURA_EXPORT PropertyConverter {
|
| std::map<const WindowProperty<base::string16*>*, const char*>
|
| string16_properties_;
|
|
|
| + // Set of transport names supplied to RegisterProperty().
|
| + std::set<std::string> transport_names_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(PropertyConverter);
|
| };
|
|
|
|
|