Index: chrome/browser/ui/views/create_application_shortcut_view.h |
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.h b/chrome/browser/ui/views/create_application_shortcut_view.h |
index db41f63d721c1d6d02796be8988b178c5c6c137d..489d55a27d6574f904b4bc6c3d2b9427b3cefed9 100644 |
--- a/chrome/browser/ui/views/create_application_shortcut_view.h |
+++ b/chrome/browser/ui/views/create_application_shortcut_view.h |
@@ -11,8 +11,8 @@ |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
#include "chrome/browser/extensions/image_loading_tracker.h" |
-#include "chrome/browser/favicon/favicon_download_helper_delegate.h" |
#include "chrome/browser/web_applications/web_app.h" |
+#include "content/public/browser/favicon_download_delegate.h" |
#include "ui/views/controls/button/button.h" |
#include "ui/views/window/dialog_delegate.h" |
@@ -85,8 +85,9 @@ class CreateApplicationShortcutView : public views::DialogDelegateView, |
}; |
// Create an application shortcut pointing to a URL. |
-class CreateUrlApplicationShortcutView : public CreateApplicationShortcutView, |
- public FaviconDownloadHelperDelegate { |
+class CreateUrlApplicationShortcutView |
+ : public CreateApplicationShortcutView, |
+ public content::FaviconDownloadDelegate { |
public: |
explicit CreateUrlApplicationShortcutView(content::WebContents* web_contents); |
virtual ~CreateUrlApplicationShortcutView(); |
@@ -98,8 +99,8 @@ class CreateUrlApplicationShortcutView : public CreateApplicationShortcutView, |
// The first largest icon downloaded and decoded successfully will be used. |
void FetchIcon(); |
- // FaviconDownloadHelperDelegate overrides. |
- virtual void OnDidDownloadFavicon( |
+ // content::FaviconDownloadDelegate overrides. |
+ virtual void DidDownloadFavicon( |
int id, |
const GURL& image_url, |
bool errored, |
@@ -109,9 +110,6 @@ class CreateUrlApplicationShortcutView : public CreateApplicationShortcutView, |
// The tab whose URL is being turned into an app. |
content::WebContents* web_contents_; |
- // Helper class to manage the downloading of favicons. |
- scoped_ptr<FaviconDownloadHelper> download_helper_; |
- |
// Pending app icon download tracked by us. |
int pending_download_id_; |