| Index: ui/aura/mus/property_converter.cc
 | 
| diff --git a/ui/aura/mus/property_converter.cc b/ui/aura/mus/property_converter.cc
 | 
| index 85cd5221acdfe32e7bb68e76ed1883f3a51a8004..3fef63e33bf352ffa4adaf8420c48c8caa31a91c 100644
 | 
| --- a/ui/aura/mus/property_converter.cc
 | 
| +++ b/ui/aura/mus/property_converter.cc
 | 
| @@ -66,29 +66,31 @@ PropertyConverter::CreateAcceptAnyValueCallback() {
 | 
|  
 | 
|  PropertyConverter::PropertyConverter() {
 | 
|    // Add known aura properties with associated mus properties.
 | 
| -  RegisterProperty(client::kAlwaysOnTopKey,
 | 
| -                   ui::mojom::WindowManager::kAlwaysOnTop_Property,
 | 
| -                   CreateAcceptAnyValueCallback());
 | 
| -  RegisterProperty(client::kAppIconKey,
 | 
| -                   ui::mojom::WindowManager::kAppIcon_Property);
 | 
| -  RegisterProperty(client::kImmersiveFullscreenKey,
 | 
| -                   ui::mojom::WindowManager::kImmersiveFullscreen_Property,
 | 
| -                   CreateAcceptAnyValueCallback());
 | 
| -  RegisterProperty(client::kNameKey, ui::mojom::WindowManager::kName_Property);
 | 
| -  RegisterProperty(client::kPreferredSize,
 | 
| -                   ui::mojom::WindowManager::kPreferredSize_Property);
 | 
| -  RegisterProperty(client::kResizeBehaviorKey,
 | 
| -                   ui::mojom::WindowManager::kResizeBehavior_Property,
 | 
| -                   base::Bind(&ValidateResizeBehaviour));
 | 
| -  RegisterProperty(client::kRestoreBoundsKey,
 | 
| -                   ui::mojom::WindowManager::kRestoreBounds_Property);
 | 
| -  RegisterProperty(client::kShowStateKey,
 | 
| -                   ui::mojom::WindowManager::kShowState_Property,
 | 
| -                   base::Bind(&ValidateShowState));
 | 
| -  RegisterProperty(client::kWindowIconKey,
 | 
| -                   ui::mojom::WindowManager::kWindowIcon_Property);
 | 
| -  RegisterProperty(client::kTitleKey,
 | 
| -                   ui::mojom::WindowManager::kWindowTitle_Property);
 | 
| +  RegisterImageSkiaProperty(client::kAppIconKey,
 | 
| +                            ui::mojom::WindowManager::kAppIcon_Property);
 | 
| +  RegisterImageSkiaProperty(client::kWindowIconKey,
 | 
| +                            ui::mojom::WindowManager::kWindowIcon_Property);
 | 
| +  RegisterPrimitiveProperty(client::kAlwaysOnTopKey,
 | 
| +                            ui::mojom::WindowManager::kAlwaysOnTop_Property,
 | 
| +                            CreateAcceptAnyValueCallback());
 | 
| +  RegisterPrimitiveProperty(
 | 
| +      client::kImmersiveFullscreenKey,
 | 
| +      ui::mojom::WindowManager::kImmersiveFullscreen_Property,
 | 
| +      CreateAcceptAnyValueCallback());
 | 
| +  RegisterPrimitiveProperty(client::kResizeBehaviorKey,
 | 
| +                            ui::mojom::WindowManager::kResizeBehavior_Property,
 | 
| +                            base::Bind(&ValidateResizeBehaviour));
 | 
| +  RegisterPrimitiveProperty(client::kShowStateKey,
 | 
| +                            ui::mojom::WindowManager::kShowState_Property,
 | 
| +                            base::Bind(&ValidateShowState));
 | 
| +  RegisterRectProperty(client::kRestoreBoundsKey,
 | 
| +                       ui::mojom::WindowManager::kRestoreBounds_Property);
 | 
| +  RegisterSizeProperty(client::kPreferredSize,
 | 
| +                       ui::mojom::WindowManager::kPreferredSize_Property);
 | 
| +  RegisterStringProperty(client::kNameKey,
 | 
| +                         ui::mojom::WindowManager::kName_Property);
 | 
| +  RegisterString16Property(client::kTitleKey,
 | 
| +                           ui::mojom::WindowManager::kWindowTitle_Property);
 | 
|  }
 | 
|  
 | 
|  PropertyConverter::~PropertyConverter() {}
 | 
| @@ -288,35 +290,35 @@ bool PropertyConverter::GetPropertyValueFromTransportValue(
 | 
|    return false;
 | 
|  }
 | 
|  
 | 
| -void PropertyConverter::RegisterProperty(
 | 
| +void PropertyConverter::RegisterImageSkiaProperty(
 | 
|      const WindowProperty<gfx::ImageSkia*>* property,
 | 
|      const char* transport_name) {
 | 
|    image_properties_[property] = transport_name;
 | 
|    transport_names_.insert(transport_name);
 | 
|  }
 | 
|  
 | 
| -void PropertyConverter::RegisterProperty(
 | 
| +void PropertyConverter::RegisterRectProperty(
 | 
|      const WindowProperty<gfx::Rect*>* property,
 | 
|      const char* transport_name) {
 | 
|    rect_properties_[property] = transport_name;
 | 
|    transport_names_.insert(transport_name);
 | 
|  }
 | 
|  
 | 
| -void PropertyConverter::RegisterProperty(
 | 
| +void PropertyConverter::RegisterSizeProperty(
 | 
|      const WindowProperty<gfx::Size*>* property,
 | 
|      const char* transport_name) {
 | 
|    size_properties_[property] = transport_name;
 | 
|    transport_names_.insert(transport_name);
 | 
|  }
 | 
|  
 | 
| -void PropertyConverter::RegisterProperty(
 | 
| +void PropertyConverter::RegisterStringProperty(
 | 
|      const WindowProperty<std::string*>* property,
 | 
|      const char* transport_name) {
 | 
|    string_properties_[property] = transport_name;
 | 
|    transport_names_.insert(transport_name);
 | 
|  }
 | 
|  
 | 
| -void PropertyConverter::RegisterProperty(
 | 
| +void PropertyConverter::RegisterString16Property(
 | 
|      const WindowProperty<base::string16*>* property,
 | 
|      const char* transport_name) {
 | 
|    string16_properties_[property] = transport_name;
 | 
| 
 |