| Index: ui/aura/mus/property_converter.h
|
| diff --git a/ui/aura/mus/property_converter.h b/ui/aura/mus/property_converter.h
|
| index 93187951142fb7eea5bc25761395470b15adc36e..c15ceacba589c106392fd4079432841865108b24 100644
|
| --- a/ui/aura/mus/property_converter.h
|
| +++ b/ui/aura/mus/property_converter.h
|
| @@ -65,6 +65,8 @@ class AURA_EXPORT PropertyConverter {
|
| const char* transport_name);
|
| void RegisterProperty(const WindowProperty<std::string*>* property,
|
| const char* transport_name);
|
| + void RegisterProperty(const WindowProperty<base::string16*>* property,
|
| + const char* transport_name);
|
|
|
| private:
|
| // A pair with the aura::WindowProperty::name and the mus property name.
|
| @@ -77,6 +79,8 @@ class AURA_EXPORT PropertyConverter {
|
| // This supports types that can be serialized for Mojo, eg. T=std::string*.
|
| std::map<const WindowProperty<gfx::Rect*>*, const char*> rect_properties_;
|
| std::map<const WindowProperty<std::string*>*, const char*> string_properties_;
|
| + std::map<const WindowProperty<base::string16*>*, const char*>
|
| + string16_properties_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PropertyConverter);
|
| };
|
|
|