Supporting high dpi favicons in Instant Extended.

chrome/browser/favicon/favicon_types.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_FAVICON_FAVICON_TYPES_H_
 #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"
 
 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 {
   FaviconImageResult();
   ~FaviconImageResult();
 
   // The resulting image.
   gfx::Image image;
 
   // The URL of the favicon which contains all of the image representations of
@@ skipping 29 matching lines @@
   IconType icon_type;
 };
 
 // Define type with same structure as FaviconBitmapResult for passing data to
 // HistoryBackend::SetFavicons().
 typedef FaviconBitmapResult FaviconBitmapData;
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_TYPES_H_