Update To 11.40.268.0

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

diff --git a/src/ui/app_list/views/app_list_folder_view.h b/src/ui/app_list/views/app_list_folder_view.h
index 2548538..4e6cb59 100644 (file)
--- a/src/ui/app_list/views/app_list_folder_view.h
+++ b/src/ui/app_list/views/app_list_folder_view.h
@@ -15,10 +15,7 @@
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
-
-namespace views {
-class ViewModel;
-}
+#include "ui/views/view_model.h"
 
 namespace app_list {
 
@@ -39,7 +36,7 @@ class AppListFolderView : public views::View,
   AppListFolderView(AppsContainerView* container_view,
                     AppListModel* model,
                     AppListMainView* app_list_main_view);
-  virtual ~AppListFolderView();
+  ~AppListFolderView() override;
 
   void SetAppListFolderItem(AppListFolderItem* folder);
 
@@ -61,15 +58,15 @@ class AppListFolderView : public views::View,
   void CloseFolderPage();
 
   // views::View
-  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;
 
   // AppListModelObserver
-  virtual void OnAppListItemWillBeDeleted(AppListItem* item) OVERRIDE;
+  void OnAppListItemWillBeDeleted(AppListItem* item) override;
 
   // ui::ImplicitAnimationObserver
-  virtual void OnImplicitAnimationsCompleted() OVERRIDE;
+  void OnImplicitAnimationsCompleted() override;
 
   AppsGridView* items_grid_view() { return items_grid_view_; }
 
@@ -81,32 +78,31 @@ class AppListFolderView : public views::View,
   // |drag_point_in_root_grid| is in the cooridnates of root level AppsGridView.
   void StartSetupDragInRootLevelAppsGridView(
       AppListItemView* original_drag_view,
-      const gfx::Point& drag_point_in_root_grid);
+      const gfx::Point& drag_point_in_root_grid,
+      bool has_native_drag);
 
   // Overridden from views::View:
-  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
+  void GetAccessibleState(ui::AXViewState* state) override;
 
   // Overridden from FolderHeaderViewDelegate:
-  virtual void NavigateBack(AppListFolderItem* item,
-                            const ui::Event& event_flags) OVERRIDE;
-  virtual void GiveBackFocusToSearchBox() OVERRIDE;
-  virtual void SetItemName(AppListFolderItem* item,
-                           const std::string& name) OVERRIDE;
+  void NavigateBack(AppListFolderItem* item,
+                    const ui::Event& event_flags) override;
+  void GiveBackFocusToSearchBox() override;
+  void SetItemName(AppListFolderItem* item, const std::string& name) override;
 
   // Overridden from AppsGridViewFolderDelegate:
-  virtual void UpdateFolderViewBackground(bool show_bubble) OVERRIDE;
-  virtual void ReparentItem(AppListItemView* original_drag_view,
-                            const gfx::Point& drag_point_in_folder_grid)
-      OVERRIDE;
-  virtual void DispatchDragEventForReparent(
+  void UpdateFolderViewBackground(bool show_bubble) override;
+  void ReparentItem(AppListItemView* original_drag_view,
+                    const gfx::Point& drag_point_in_folder_grid,
+                    bool has_native_drag) override;
+  void DispatchDragEventForReparent(
       AppsGridView::Pointer pointer,
-      const gfx::Point& drag_point_in_folder_grid) OVERRIDE;
-  virtual void DispatchEndDragEventForReparent(
-      bool events_forwarded_to_drag_drop_host,
-      bool cancel_drag) OVERRIDE;
-  virtual bool IsPointOutsideOfFolderBoundary(const gfx::Point& point) OVERRIDE;
-  virtual bool IsOEMFolder() const OVERRIDE;
-  virtual void SetRootLevelDragViewVisible(bool visible) OVERRIDE;
+      const gfx::Point& drag_point_in_folder_grid) override;
+  void DispatchEndDragEventForReparent(bool events_forwarded_to_drag_drop_host,
+                                       bool cancel_drag) override;
+  bool IsPointOutsideOfFolderBoundary(const gfx::Point& point) override;
+  bool IsOEMFolder() const override;
+  void SetRootLevelDragViewVisible(bool visible) override;
 
   AppsContainerView* container_view_;  // Not owned.
   AppListMainView* app_list_main_view_;   // Not Owned.