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

ui/app_list/app_list_folder_item.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 UI_APP_LIST_APP_LIST_FOLDER_ITEM_H_
 #define UI_APP_LIST_APP_LIST_FOLDER_ITEM_H_
 
 #include <string>
 #include <vector>
 
 #include "ui/app_list/app_list_export.h"
 #include "ui/app_list/app_list_item.h"
 #include "ui/app_list/app_list_item_list_observer.h"
 #include "ui/app_list/app_list_item_observer.h"
-#include "ui/gfx/geometry/rect.h"
+
+namespace gfx {
+class Rect;
+}
 
 namespace app_list {
 
 class AppListItemList;
 
-typedef std::vector<gfx::Rect> Rects;
-
 // AppListFolderItem implements the model/controller for folders.
 class APP_LIST_EXPORT AppListFolderItem : public AppListItem,
                                           public AppListItemListObserver,
                                           public AppListItemObserver {
  public:
   // The folder type affects folder behavior.
   enum FolderType {
     // Default folder type.
     FOLDER_TYPE_NORMAL,
     // Items can not be moved to/from OEM folders in the UI.
@@ skipping 30 matching lines @@
   virtual const char* GetItemType() const override;
   virtual ui::MenuModel* GetContextMenuModel() override;
   virtual AppListItem* FindChildItem(const std::string& id) override;
   virtual size_t ChildItemCount() const override;
   virtual void OnExtensionPreferenceChanged() override;
   virtual bool CompareForTest(const AppListItem* other) const override;
 
   // Calculates the top item icons' bounds inside |folder_icon_bounds|.
   // Returns the bounds of top item icons in sequence of top left, top right,
   // bottom left, bottom right.
-  static Rects GetTopIconsBounds(const gfx::Rect& folder_icon_bounds);
+  static std::vector<gfx::Rect> GetTopIconsBounds(
+      const gfx::Rect& folder_icon_bounds);
 
   // Returns an id for a new folder.
   static std::string GenerateId();
 
  private:
   // AppListItemObserver
   virtual void ItemIconChanged() override;
 
   // AppListItemListObserver
   virtual void OnListItemAdded(size_t index, AppListItem* item) override;
@@ skipping 13 matching lines @@
 
   // Top items for generating folder icon.
   std::vector<AppListItem*> top_items_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListFolderItem);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_APP_LIST_FOLDER_ITEM_H_