| Index: chrome/browser/ui/views/frame/taskbar_decorator_win.cc
|
| diff --git a/chrome/browser/ui/views/frame/taskbar_decorator_win.cc b/chrome/browser/ui/views/frame/taskbar_decorator_win.cc
|
| index 95267720cb281539c2b63f6b4197ecf107aa248b..d6328fad663b7aa1c2bd6919c7ee705d37373ff4 100644
|
| --- a/chrome/browser/ui/views/frame/taskbar_decorator_win.cc
|
| +++ b/chrome/browser/ui/views/frame/taskbar_decorator_win.cc
|
| @@ -59,11 +59,11 @@ void SetOverlayIcon(HWND hwnd, scoped_ptr<SkBitmap> bitmap) {
|
| SkCanvas offscreen_canvas(offscreen_bitmap);
|
| offscreen_canvas.clear(SK_ColorTRANSPARENT);
|
| offscreen_canvas.drawBitmap(sk_icon, 0, kOverlayIconSize - resized_height);
|
| - icon.Set(IconUtil::CreateHICONFromSkBitmap(offscreen_bitmap));
|
| - if (!icon.Get())
|
| + icon = IconUtil::CreateHICONFromSkBitmap(offscreen_bitmap).Pass();
|
| + if (!icon.is_valid())
|
| return;
|
| }
|
| - taskbar->SetOverlayIcon(hwnd, icon, L"");
|
| + taskbar->SetOverlayIcon(hwnd, icon.get(), L"");
|
| }
|
|
|
| } // namespace
|
|
|