app_list_folder_item.h: Fix typedefs and includes (ahead of refactor).

ui/app_list/app_list_folder_item.cc

 // 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.
 
 #include "ui/app_list/app_list_folder_item.h"
 
 #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/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.
@@ skipping 34 matching lines @@
     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);
-    Rects top_icon_bounds =
+    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_;
@@ skipping 32 matching lines @@
 const gfx::ImageSkia& AppListFolderItem::GetTopIcon(size_t item_index) {
   DCHECK(item_index <= top_items_.size());
   return top_items_[item_index]->icon();
 }
 
 gfx::Rect AppListFolderItem::GetTargetIconRectInFolderForItem(
     AppListItem* item,
     const gfx::Rect& folder_icon_bounds) {
   for (size_t i = 0; i < top_items_.size(); ++i) {
     if (item->id() == top_items_[i]->id()) {
-      Rects rects = AppListFolderItem::GetTopIconsBounds(folder_icon_bounds);
+      std::vector<gfx::Rect> rects =
+          AppListFolderItem::GetTopIconsBounds(folder_icon_bounds);
       return rects[i];
     }
   }
 
   gfx::Rect target_rect(folder_icon_bounds);
   target_rect.ClampToCenteredSize(
       gfx::Size(kItemIconDimension, kItemIconDimension));
   return target_rect;
 }
 
 void AppListFolderItem::Activate(int event_flags) {
   // Folder handling is implemented by the View, so do nothing.
 }
 
 // static
 const char AppListFolderItem::kItemType[] = "FolderItem";
 
 // static
-Rects AppListFolderItem::GetTopIconsBounds(
+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();
-  Rects top_icon_bounds;
+  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);
@@ skipping 85 matching lines @@
   for (size_t i = 0;
        i < kNumFolderTopItems && i < item_list_->item_count(); ++i) {
     AppListItem* item = item_list_->item_at(i);
     item->AddObserver(this);
     top_items_.push_back(item);
   }
   UpdateIcon();
 }
 
 }  // namespace app_list