Moved FolderImageSource class to a separate file.

ui/app_list/app_list_folder_item.cc

Index: ui/app_list/app_list_folder_item.cc
diff --git a/ui/app_list/app_list_folder_item.cc b/ui/app_list/app_list_folder_item.cc
index b9f24abcff2826b5dceccb1c874203ce71d1fd51..a844be6ac518bd740cccfafd4b569df2173a46cb 100644
--- a/ui/app_list/app_list_folder_item.cc
+++ b/ui/app_list/app_list_folder_item.cc
@@ -7,79 +7,11 @@
 #include "base/guid.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_item_list.h"
-#include "ui/gfx/canvas.h"
+#include "ui/app_list/folder_image_source.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/image/canvas_image_source.h"
-#include "ui/gfx/image/image_skia_operations.h"
 
 namespace app_list {
 
-namespace {
-
-const int kItemIconDimension = 16;
-
-// Generates the folder icon with the top 4 child item icons laid in 2x2 tile.
-class FolderImageSource : public gfx::CanvasImageSource {
- public:
-  typedef std::vector<gfx::ImageSkia> Icons;
-
-  FolderImageSource(const Icons& icons, const gfx::Size& size)
-      : gfx::CanvasImageSource(size, false),
-        icons_(icons),
-        size_(size) {
-    DCHECK(icons.size() <= kNumFolderTopItems);
-  }
-
-  virtual ~FolderImageSource() {}
-
- private:
-  void DrawIcon(gfx::Canvas* canvas,
-                const gfx::ImageSkia& icon,
-                const gfx::Size icon_size,
-                int x, int y) {
-    if (icon.isNull())
-      return;
-
-    gfx::ImageSkia resized(
-        gfx::ImageSkiaOperations::CreateResizedImage(
-            icon, skia::ImageOperations::RESIZE_BEST, icon_size));
-    canvas->DrawImageInt(resized, 0, 0, resized.width(), resized.height(),
-        x, y, resized.width(), resized.height(), true);
-  }
-
-  // gfx::CanvasImageSource overrides:
-  virtual void Draw(gfx::Canvas* canvas) override {
-    // Draw folder circle.
-    gfx::Point center = gfx::Point(size().width() / 2 , size().height() / 2);
-    SkPaint paint;
-    paint.setStyle(SkPaint::kFill_Style);
-    paint.setAntiAlias(true);
-    paint.setColor(kFolderBubbleColor);
-    canvas->DrawCircle(center, size().width() / 2, paint);
-
-    if (icons_.size() == 0)
-      return;
-
-    // Draw top items' icons.
-    const gfx::Size item_icon_size =
-        gfx::Size(kItemIconDimension, kItemIconDimension);
-    std::vector<gfx::Rect> top_icon_bounds =
-        AppListFolderItem::GetTopIconsBounds(gfx::Rect(size()));
-
-    for (size_t i= 0; i < kNumFolderTopItems && i < icons_.size(); ++i) {
-      DrawIcon(canvas, icons_[i], item_icon_size,
-               top_icon_bounds[i].x(), top_icon_bounds[i].y());
-    }
-  }
-
-  Icons icons_;
-  gfx::Size size_;
-
-  DISALLOW_COPY_AND_ASSIGN(FolderImageSource);
-};
-
-}  // namespace
-
 AppListFolderItem::AppListFolderItem(const std::string& id,
                                      FolderType folder_type)
     : AppListItem(id),
@@ -117,14 +49,13 @@ gfx::Rect AppListFolderItem::GetTargetIconRectInFolderForItem(
   for (size_t i = 0; i < top_items_.size(); ++i) {
     if (item->id() == top_items_[i]->id()) {
       std::vector<gfx::Rect> rects =
-          AppListFolderItem::GetTopIconsBounds(folder_icon_bounds);
+          FolderImageSource::GetTopIconsBounds(folder_icon_bounds);
       return rects[i];
     }
   }
 
   gfx::Rect target_rect(folder_icon_bounds);
-  target_rect.ClampToCenteredSize(
-      gfx::Size(kItemIconDimension, kItemIconDimension));
+  target_rect.ClampToCenteredSize(FolderImageSource::ItemIconSize());
   return target_rect;
 }
 
@@ -135,38 +66,6 @@ void AppListFolderItem::Activate(int event_flags) {
 // static
 const char AppListFolderItem::kItemType[] = "FolderItem";
 
-// static
-std::vector<gfx::Rect> AppListFolderItem::GetTopIconsBounds(
-    const gfx::Rect& folder_icon_bounds) {
-  const int delta_to_center = 1;
-  gfx::Point icon_center = folder_icon_bounds.CenterPoint();
-  std::vector<gfx::Rect> top_icon_bounds;
-
-  // Get the top left icon bounds.
-  int left_x = icon_center.x() - kItemIconDimension - delta_to_center;
-  int top_y = icon_center.y() - kItemIconDimension - delta_to_center;
-  gfx::Rect top_left(left_x, top_y, kItemIconDimension, kItemIconDimension);
-  top_icon_bounds.push_back(top_left);
-
-  // Get the top right icon bounds.
-  int right_x = icon_center.x() + delta_to_center;
-  gfx::Rect top_right(right_x, top_y, kItemIconDimension, kItemIconDimension);
-  top_icon_bounds.push_back(top_right);
-
-  // Get the bottom left icon bounds.
-  int bottom_y = icon_center.y() + delta_to_center;
-  gfx::Rect bottom_left(
-      left_x, bottom_y, kItemIconDimension, kItemIconDimension);
-  top_icon_bounds.push_back(bottom_left);
-
-  // Get the bottom right icon bounds.
-  gfx::Rect bottom_right(
-      right_x, bottom_y, kItemIconDimension, kItemIconDimension);
-  top_icon_bounds.push_back(bottom_right);
-
-  return top_icon_bounds;
-}
-
 const char* AppListFolderItem::GetItemType() const {
   return AppListFolderItem::kItemType;
 }