| Index: chrome/browser/ui/views/ash/balloon_view_ash.cc
|
| diff --git a/chrome/browser/ui/views/ash/balloon_view_ash.cc b/chrome/browser/ui/views/ash/balloon_view_ash.cc
|
| index 0975e9c5519306f5eeea28693ed80646ce53e3db..a578e127c9c7f071052373bd540cdcb0060e8891 100644
|
| --- a/chrome/browser/ui/views/ash/balloon_view_ash.cc
|
| +++ b/chrome/browser/ui/views/ash/balloon_view_ash.cc
|
| @@ -65,11 +65,12 @@ class BalloonViewAsh::IconFetcher : public content::WebContentsObserver {
|
| void OnDidDownloadFavicon(int id,
|
| const GURL& image_url,
|
| bool errored,
|
| - const SkBitmap& bitmap) {
|
| - if (image_url != icon_url_ || id != request_id_)
|
| + int requested_size,
|
| + const std::vector<SkBitmap>& bitmaps) {
|
| + if (image_url != icon_url_ || id != request_id_ || bitmaps.empty())
|
| return;
|
| GetWebNotificationTray()->SetNotificationImage(
|
| - notification_id_, gfx::ImageSkia(bitmap));
|
| + notification_id_, gfx::ImageSkia(bitmaps[0]));
|
| }
|
|
|
| private:
|
|
|