Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / app_list / views / apps_container_view.h

diff --git a/src/ui/app_list/views/apps_container_view.h b/src/ui/app_list/views/apps_container_view.h
index 3278385..2ba68a2 100644 (file)
--- a/src/ui/app_list/views/apps_container_view.h
+++ b/src/ui/app_list/views/apps_container_view.h
@@ -11,6 +11,10 @@
 #include "ui/app_list/views/top_icon_animation_view.h"
 #include "ui/views/view.h"
 
+namespace gfx {
+class Rect;
+}
+
 namespace app_list {
 
 class AppsGridView;
@@ -30,7 +34,7 @@ class AppsContainerView : public views::View,
  public:
   AppsContainerView(AppListMainView* app_list_main_view,
                     AppListModel* model);
-  virtual ~AppsContainerView();
+  ~AppsContainerView() override;
 
   // Shows the active folder content specified by |folder_item|.
   void ShowActiveFolder(AppListFolderItem* folder_item);
@@ -58,12 +62,12 @@ class AppsContainerView : public views::View,
   bool IsInFolderView() const;
 
   // views::View overrides:
-  virtual gfx::Size GetPreferredSize() const OVERRIDE;
-  virtual void Layout() OVERRIDE;
-  virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
+  gfx::Size GetPreferredSize() const override;
+  void Layout() override;
+  bool OnKeyPressed(const ui::KeyEvent& event) override;
 
   // TopIconAnimationObserver overrides:
-  virtual void OnTopIconAnimationsComplete() OVERRIDE;
+  void OnTopIconAnimationsComplete() override;
 
   AppsGridView* apps_grid_view() { return apps_grid_view_; }
   FolderBackgroundView* folder_background_view() {
@@ -85,7 +89,7 @@ class AppsContainerView : public views::View,
   // is relative to AppsContainerView.
   // Returns the bounds of top items' icon in sequence of top left, top right,
   // bottom left, bottom right.
-  Rects GetTopItemIconBoundsInActiveFolder();
+  std::vector<gfx::Rect> GetTopItemIconBoundsInActiveFolder();
 
   // Creates the transitional views for animating the top items in the folder
   // when opening or closing a folder.