summaryrefslogtreecommitdiffstats
path: root/chrome/browser/fav_icon_helper.h
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-25 19:07:44 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-25 19:07:44 +0000
commit34f128ddf083c4ff1d21bb2bf10859cf2c040ad6 (patch)
tree31c266487bf62bc13a451288fa8333c1506f092c /chrome/browser/fav_icon_helper.h
parent6804b15439f1f40d38df1052e6165a55f216e2ec (diff)
downloadchromium_src-34f128ddf083c4ff1d21bb2bf10859cf2c040ad6.zip
chromium_src-34f128ddf083c4ff1d21bb2bf10859cf2c040ad6.tar.gz
chromium_src-34f128ddf083c4ff1d21bb2bf10859cf2c040ad6.tar.bz2
Get rid of a few more interfaces from RenderViewHostDelegate that aren't needed.
Review URL: http://codereview.chromium.org/6374009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72522 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/fav_icon_helper.h')
-rw-r--r--chrome/browser/fav_icon_helper.h21
1 files changed, 10 insertions, 11 deletions
diff --git a/chrome/browser/fav_icon_helper.h b/chrome/browser/fav_icon_helper.h
index a64eba2..f0706bd 100644
--- a/chrome/browser/fav_icon_helper.h
+++ b/chrome/browser/fav_icon_helper.h
@@ -13,7 +13,7 @@
#include "base/ref_counted.h"
#include "chrome/browser/cancelable_request.h"
#include "chrome/browser/favicon_service.h"
-#include "chrome/browser/renderer_host/render_view_host_delegate.h"
+#include "chrome/browser/tab_contents/web_navigation_observer.h"
#include "chrome/common/ref_counted_util.h"
#include "googleurl/src/gurl.h"
@@ -65,7 +65,7 @@ class TabContents;
// at which point we update the favicon of the NavigationEntry and notify
// the database to save the favicon.
-class FavIconHelper : public RenderViewHostDelegate::FavIcon {
+class FavIconHelper : public WebNavigationObserver {
public:
explicit FavIconHelper(TabContents* tab_contents);
virtual ~FavIconHelper();
@@ -99,15 +99,14 @@ class FavIconHelper : public RenderViewHostDelegate::FavIcon {
ImageDownloadCallback* callback;
};
- // RenderViewHostDelegate::Favicon implementation.
- virtual void DidDownloadFavIcon(RenderViewHost* render_view_host,
- int id,
- const GURL& image_url,
- bool errored,
- const SkBitmap& image);
- virtual void UpdateFavIconURL(RenderViewHost* render_view_host,
- int32 page_id,
- const GURL& icon_url);
+ // WebNavigationObserver implementation.
+ virtual bool OnMessageReceived(const IPC::Message& message);
+
+ void OnDidDownloadFavIcon(int id,
+ const GURL& image_url,
+ bool errored,
+ const SkBitmap& image);
+ void OnUpdateFavIconURL(int32 page_id, const GURL& icon_url);
// Return the NavigationEntry for the active entry, or NULL if the active
// entries URL does not match that of the URL last passed to FetchFavIcon.