| 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..74c07bf64dc1ecf526465dd4d928807abb95a996 100644
|
| --- a/chrome/browser/ui/views/ash/balloon_view_ash.h
|
| +++ b/chrome/browser/ui/views/ash/balloon_view_ash.h
|
| @@ -5,16 +5,15 @@
|
| #ifndef CHROME_BROWSER_UI_VIEWS_ASH_BALLOON_VIEW_ASH_H_
|
| #define CHROME_BROWSER_UI_VIEWS_ASH_BALLOON_VIEW_ASH_H_
|
|
|
| -#include <map>
|
| +#include <vector>
|
|
|
| -#include "chrome/browser/favicon/favicon_download_helper_delegate.h"
|
| #include "chrome/browser/notifications/balloon.h"
|
|
|
| -class FaviconDownloadHelper;
|
| +class GURL;
|
| +class SkBitmap;
|
|
|
| // On Ash, a "BalloonView" is just a wrapper for ash notification entries.
|
| -class BalloonViewAsh : public BalloonView,
|
| - public FaviconDownloadHelperDelegate {
|
| +class BalloonViewAsh : public BalloonView {
|
| public:
|
| explicit BalloonViewAsh(BalloonCollection* collection);
|
| virtual ~BalloonViewAsh();
|
| @@ -27,21 +26,19 @@ class BalloonViewAsh : public BalloonView,
|
| virtual gfx::Size GetSize() const OVERRIDE;
|
| virtual BalloonHost* GetHost() const OVERRIDE;
|
|
|
| - // FaviconDownloadHelperDelegate interface:
|
| - virtual void OnDidDownloadFavicon(
|
| + private:
|
| + // Favicon download callback.
|
| + void DidDownloadFavicon(
|
| int id,
|
| const GURL& image_url,
|
| bool errored,
|
| int requested_size,
|
| - const std::vector<SkBitmap>& bitmaps) OVERRIDE;
|
| -
|
| - private:
|
| + const std::vector<SkBitmap>& bitmaps);
|
| void FetchIcon(const Notification& notification);
|
| std::string GetExtensionId(Balloon* balloon);
|
|
|
| BalloonCollection* collection_;
|
| Balloon* balloon_;
|
| - scoped_ptr<FaviconDownloadHelper> icon_fetcher_;
|
|
|
| // Track the current notification id and download id so that it can be updated
|
| // properly.
|
|
|