| Index: chrome/browser/ui/views/ash/balloon_view_ash.h
|
| diff --git a/chrome/browser/ui/views/ash/balloon_view_ash.h b/chrome/browser/ui/views/ash/balloon_view_ash.h
|
| index ff56d34e62b76f500092ca11c23c82602a3e73ce..c850d8474dd4ef7b6cfcb8d90de718ffa4da7be2 100644
|
| --- a/chrome/browser/ui/views/ash/balloon_view_ash.h
|
| +++ b/chrome/browser/ui/views/ash/balloon_view_ash.h
|
| @@ -7,14 +7,13 @@
|
|
|
| #include <map>
|
|
|
| -#include "chrome/browser/favicon/favicon_download_helper_delegate.h"
|
| #include "chrome/browser/notifications/balloon.h"
|
| +#include "content/public/browser/favicon_download_delegate.h"
|
|
|
| -class FaviconDownloadHelper;
|
|
|
| // On Ash, a "BalloonView" is just a wrapper for ash notification entries.
|
| class BalloonViewAsh : public BalloonView,
|
| - public FaviconDownloadHelperDelegate {
|
| + public content::FaviconDownloadDelegate {
|
| public:
|
| explicit BalloonViewAsh(BalloonCollection* collection);
|
| virtual ~BalloonViewAsh();
|
| @@ -27,8 +26,8 @@ class BalloonViewAsh : public BalloonView,
|
| virtual gfx::Size GetSize() const OVERRIDE;
|
| virtual BalloonHost* GetHost() const OVERRIDE;
|
|
|
| - // FaviconDownloadHelperDelegate interface:
|
| - virtual void OnDidDownloadFavicon(
|
| + // Content::FaviconDownloadDelegate interface:
|
| + virtual void DidDownloadFavicon(
|
| int id,
|
| const GURL& image_url,
|
| bool errored,
|
| @@ -41,7 +40,6 @@ class BalloonViewAsh : public BalloonView,
|
|
|
| BalloonCollection* collection_;
|
| Balloon* balloon_;
|
| - scoped_ptr<FaviconDownloadHelper> icon_fetcher_;
|
|
|
| // Track the current notification id and download id so that it can be updated
|
| // properly.
|
|
|