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 0e3d2420085f70d252826c88e91d0bee1e09f516..772ddf57ced392a362023cc9927be63b354b2e45 100644 |
--- a/chrome/browser/ui/views/ash/balloon_view_ash.cc |
+++ b/chrome/browser/ui/views/ash/balloon_view_ash.cc |
@@ -9,12 +9,10 @@ |
#include "base/logging.h" |
#include "base/values.h" |
#include "chrome/browser/extensions/extension_service.h" |
-#include "chrome/browser/favicon/favicon_download_helper.h" |
#include "chrome/browser/favicon/favicon_util.h" |
#include "chrome/browser/notifications/balloon_collection.h" |
#include "chrome/browser/notifications/notification.h" |
#include "chrome/browser/profiles/profile.h" |
-#include "chrome/common/icon_messages.h" |
#include "content/public/browser/render_process_host.h" |
#include "content/public/browser/render_view_host.h" |
#include "content/public/browser/site_instance.h" |
@@ -109,13 +107,13 @@ void BalloonViewAsh::FetchIcon(const Notification& notification) { |
LOG(WARNING) << "Notification has icon url but no WebContents"; |
return; |
} |
- icon_fetcher_.reset(new FaviconDownloadHelper(web_contents, this)); |
- current_download_id_ = icon_fetcher_->DownloadFavicon( |
+ web_contents->RegisterFaviconDelegate(this); |
+ current_download_id_ = web_contents->DownloadFavicon( |
notification.icon_url(), kNotificationIconImageSize); |
cached_notification_id_ = notification.notification_id(); |
} |
-void BalloonViewAsh::OnDidDownloadFavicon( |
+void BalloonViewAsh::DidDownloadFavicon( |
int id, |
const GURL& image_url, |
bool errored, |