diff options
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/mus/shelf_delegate_mus.cc | 3 | ||||
| -rw-r--r-- | ash/mus/sysui_application.cc | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/ash/mus/shelf_delegate_mus.cc b/ash/mus/shelf_delegate_mus.cc index 5b06eda..7dbff29 100644 --- a/ash/mus/shelf_delegate_mus.cc +++ b/ash/mus/shelf_delegate_mus.cc @@ -85,8 +85,7 @@ class ShelfItemDelegateMus : public ShelfItemDelegate { gfx::ImageSkia GetShelfIconFromBitmap( const mojo::Array<uint8_t>& serialized_bitmap) { // Convert the data to an ImageSkia. - SkBitmap bitmap = mojo::ConvertTo<SkBitmap, const std::vector<uint8_t>>( - serialized_bitmap.storage()); + SkBitmap bitmap = mojo::ConvertTo<SkBitmap>(serialized_bitmap.storage()); gfx::ImageSkia icon_image; if (!bitmap.isNull()) { icon_image = gfx::ImageSkia::CreateFrom1xBitmap(bitmap); diff --git a/ash/mus/sysui_application.cc b/ash/mus/sysui_application.cc index 5fd5aac..9230248 100644 --- a/ash/mus/sysui_application.cc +++ b/ash/mus/sysui_application.cc @@ -131,14 +131,13 @@ class NativeWidgetFactory { mash::wm::mojom::Container container = GetContainerId(params); if (container != mash::wm::mojom::Container::COUNT) { properties[mash::wm::mojom::kWindowContainer_Property] = - mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert( + mojo::ConvertTo<std::vector<uint8_t>>( static_cast<int32_t>(container)); } mash::wm::mojom::AshWindowType type = GetAshWindowType(params.parent); if (type != mash::wm::mojom::AshWindowType::COUNT) { properties[mash::wm::mojom::kAshWindowType_Property] = - mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert( - static_cast<int32_t>(type)); + mojo::ConvertTo<std::vector<uint8_t>>(static_cast<int32_t>(type)); } } |