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

Unified Diff: content/public/browser/favicon_status.h

Issue 10828127: Use hi-resolution favicon variants if available. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: daringfireball hackfix Created 8 years, 5 months 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: content/public/browser/favicon_status.h
diff --git a/content/public/browser/favicon_status.h b/content/public/browser/favicon_status.h
index 6d5a8792135f83c85419262c5fcf8443ca739365..6c6142e738d5b67aca86769a3f17b9edffd746e5 100644
--- a/content/public/browser/favicon_status.h
+++ b/content/public/browser/favicon_status.h
@@ -7,6 +7,7 @@
#include "content/common/content_export.h"
#include "googleurl/src/gurl.h"
+#include "ui/gfx/image/image.h"
#include "third_party/skia/include/core/SkBitmap.h"
namespace content {
@@ -26,7 +27,9 @@ struct CONTENT_EXPORT FaviconStatus {
// set or it empty, it will return the default favicon. Note that this is
// loaded asynchronously, so even if the favicon URL is valid we may return
// the default favicon if we haven't gotten the data yet.
- SkBitmap bitmap;
+ SkBitmap bitmap; // XXX delete
+
+ gfx::Image image;
// Copy and assignment is explicitly allowed for this struct.
};

Powered by Google App Engine
This is Rietveld 408576698