Supporting high dpi favicons in Instant Extended.

chrome/browser/favicon/favicon_types.h

Index: chrome/browser/favicon/favicon_types.h
diff --git a/chrome/browser/favicon/favicon_types.h b/chrome/browser/favicon/favicon_types.h
index f48ec4bf479fe97043002d8390bfb0e051d5546f..220d998c5e51417aef0d59c1f2346f790bc0045f 100644
--- a/chrome/browser/favicon/favicon_types.h
+++ b/chrome/browser/favicon/favicon_types.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_FAVICON_FAVICON_TYPES_H_
 
 #include "base/memory/ref_counted_memory.h"
+#include "chrome/common/favicon_types.h"

[samarth, 2013/06/14 21:54:46]

This is up to the favicon OWNERS but I'd prefer a single place (in
chrome/common) to have all the types rather than being split across multiple
files.

[pedro (no code reviews), 2013/06/18 22:35:13]

That's a good point, but as we discussed offline, I'll wait for the OWNERS
review before doing this change.

 #include "googleurl/src/gurl.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/size.h"
@@ -14,18 +15,6 @@ namespace chrome {
 
 typedef int64 FaviconID;
 
-// Defines the icon types. They are also stored in icon_type field of favicons
-// table.
-// The values of the IconTypes are used to select the priority in which favicon
-// data is returned in HistoryBackend and ThumbnailDatabase. Data for the
-// largest IconType takes priority if data for multiple IconTypes is available.
-enum IconType {
-  INVALID_ICON = 0x0,
-  FAVICON = 1 << 0,
-  TOUCH_ICON = 1 << 1,
-  TOUCH_PRECOMPOSED_ICON = 1 << 2
-};
-
 // Defines a gfx::Image of size desired_size_in_dip composed of image
 // representations for each of the desired scale factors.
 struct FaviconImageResult {