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

Unified Diff: chrome/browser/ui/views/create_application_shortcut_view.h

Issue 11411180: move favicon download code from chrome/ into content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix order Created 8 years 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/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..d2eeddb9e2c7565e8b28a58cdc724782e0a3891a 100644
--- a/chrome/browser/ui/views/create_application_shortcut_view.h
+++ b/chrome/browser/ui/views/create_application_shortcut_view.h
@@ -11,12 +11,12 @@
#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 "ui/views/controls/button/button.h"
#include "ui/views/window/dialog_delegate.h"
class FaviconDownloadHelper;
+class GURL;
class Profile;
class SkBitmap;
@@ -85,8 +85,7 @@ class CreateApplicationShortcutView : public views::DialogDelegateView,
};
// Create an application shortcut pointing to a URL.
-class CreateUrlApplicationShortcutView : public CreateApplicationShortcutView,
- public FaviconDownloadHelperDelegate {
+class CreateUrlApplicationShortcutView : public CreateApplicationShortcutView {
public:
explicit CreateUrlApplicationShortcutView(content::WebContents* web_contents);
virtual ~CreateUrlApplicationShortcutView();
@@ -98,20 +97,17 @@ class CreateUrlApplicationShortcutView : public CreateApplicationShortcutView,
// The first largest icon downloaded and decoded successfully will be used.
void FetchIcon();
- // FaviconDownloadHelperDelegate overrides.
- virtual void OnDidDownloadFavicon(
+ // Favicon download callback.
+ void DidDownloadFavicon(
int id,
const GURL& image_url,
bool errored,
int requested_size,
- const std::vector<SkBitmap>& bitmaps) OVERRIDE;
+ const std::vector<SkBitmap>& bitmaps);
// 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_;
« no previous file with comments | « chrome/browser/ui/views/ash/balloon_view_ash.cc ('k') | chrome/browser/ui/views/create_application_shortcut_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698