| Index: ash/mus/shelf_delegate_mus.cc
|
| diff --git a/ash/mus/shelf_delegate_mus.cc b/ash/mus/shelf_delegate_mus.cc
|
| index 5b06edaa1e699bd4fa827ec5b90e30cd4d540f05..7dbff29a0a7def32c2a02f5945762655bc9ac89a 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);
|
|
|