[Icons NTP] Refactor large_icon_source to extract the logic shared between desktop and Android to f…

components/favicon_base/favicon_types.h

 // Copyright 2014 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 COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_
 #define COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_
 
 #include "base/memory/ref_counted_memory.h"
+#include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
 namespace favicon_base {
 
 typedef int64 FaviconID;
 
 // Defines the icon types. They are also stored in icon_type field of favicons
 // table.
@@ skipping 46 matching lines @@
   GURL icon_url;
 
   // The icon type of the containing favicon.
   IconType icon_type;
 };
 
 // Define type with same structure as FaviconRawBitmapResult for passing data to
 // HistoryBackend::SetFavicons().
 typedef FaviconRawBitmapResult FaviconRawBitmapData;
 
+// Result returned when accessing a large icon, which is either a bitmap if
+// one was available; or the dominant color of a smaller icon if one was
+// available; or a fully transparent color if no icons were available.
+struct LargeIconResult {
+  LargeIconResult();
+  ~LargeIconResult();
+
+  // Returns true if either the bitmap or the color is valid.
+  bool is_valid() const { return bitmap.is_valid() || is_color_valid(); }

[huangs, 2015/04/17 03:55:17]

It seems this is never used?

[beaudoin, 2015/04/17 14:50:52]

Done.

+
+  // Returns true if the color is valid.
+  bool is_color_valid() const { return SkColorGetA(dominant_color) != 0; }
+
+  // The bitmap of the large icon if available.
+  FaviconRawBitmapResult bitmap;
+
+  // The dominant color of a smaller icon if a large one isn't available.
+  SkColor dominant_color;

[huangs, 2015/04/17 03:55:17]

This can be FallbackIconStyle, which is always properly initialized.  Then
is_color_valid() is always true, and we remove it along with is_valid() (which
is unused anyway).

[beaudoin, 2015/04/17 14:50:52]

Done.

+};
+
 }  // namespace favicon_base
 
 #endif  // COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_