Index: components/favicon_base/favicon_types.h |
diff --git a/components/favicon_base/favicon_types.h b/components/favicon_base/favicon_types.h |
index ea6475429d93d931fb9f511fbe24adaa16ccd38e..f7c812abcff54c4e1c86bc16b90f56f1af91f2a7 100644 |
--- a/components/favicon_base/favicon_types.h |
+++ b/components/favicon_base/favicon_types.h |
@@ -6,12 +6,15 @@ |
#define COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_ |
#include "base/memory/ref_counted_memory.h" |
+#include "base/memory/scoped_ptr.h" |
#include "ui/gfx/geometry/size.h" |
#include "ui/gfx/image/image.h" |
#include "url/gurl.h" |
namespace favicon_base { |
+struct FallbackIconStyle; |
+ |
typedef int64 FaviconID; |
// Defines the icon types. They are also stored in icon_type field of favicons |
@@ -72,6 +75,22 @@ struct FaviconRawBitmapResult { |
// HistoryBackend::SetFavicons(). |
typedef FaviconRawBitmapResult FaviconRawBitmapData; |
+// Result returned by LargeIconService::GetLargeIconOrFallbackStyle(). Contains |
+// either the bitmap data if the favicon database has a sufficiently large |
+// favicon bitmap and the style of the fallback icon otherwise. |
+struct LargeIconResult { |
+ LargeIconResult(); |
+ ~LargeIconResult(); |
+ |
+ // The bitmap from the favicon database if the database has a sufficiently |
+ // large one. |
+ FaviconRawBitmapResult bitmap; |
+ |
+ // The fallback icon style if a sufficiently large icon isn't available. This |
+ // uses the dominant color of a smaller icon as the background if available. |
+ scoped_ptr<FallbackIconStyle> fallback_icon_style; |
+}; |
+ |
} // namespace favicon_base |
#endif // COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_ |