Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(989)

Unified Diff: chrome/browser/ui/views/ash/balloon_view_ash.cc

Issue 11411180: move favicon download code from chrome/ into content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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,

Powered by Google App Engine
This is Rietveld 408576698