| Index: ui/app_list/views/apps_grid_view.h
|
| diff --git a/ui/app_list/views/apps_grid_view.h b/ui/app_list/views/apps_grid_view.h
|
| index c63c0e1419018894c96f2e9bb593682a0fa419f2..2e70d3802be6982a10e7689c5a9ecdef326182d0 100644
|
| --- a/ui/app_list/views/apps_grid_view.h
|
| +++ b/ui/app_list/views/apps_grid_view.h
|
| @@ -14,6 +14,7 @@
|
| #include "ui/app_list/app_list_model.h"
|
| #include "ui/app_list/app_list_model_observer.h"
|
| #include "ui/app_list/pagination_model_observer.h"
|
| +#include "ui/base/dragdrop/os_exchange_data.h"
|
| #include "ui/base/models/list_model_observer.h"
|
| #include "ui/compositor/layer_animation_observer.h"
|
| #include "ui/gfx/image/image_skia_operations.h"
|
| @@ -68,6 +69,8 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
|
| TOUCH,
|
| };
|
|
|
| + static const char kViewClassName[];
|
| +
|
| // Constructs the app icon grid view. |delegate| is the delegate of this
|
| // view, which usually is the hosting AppListView. |pagination_model| is
|
| // the paging info shared within the launcher UI.
|
| @@ -131,6 +134,7 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
|
| bool dragging() const { return drag_pointer_ != NONE; }
|
|
|
| // Overridden from views::View:
|
| + virtual const char* GetClassName() const OVERRIDE;
|
| virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| virtual void Layout() OVERRIDE;
|
| virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
|
| @@ -139,8 +143,8 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
|
| const ViewHierarchyChangedDetails& details) OVERRIDE;
|
| virtual bool GetDropFormats(
|
| int* formats,
|
| - std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
|
| - virtual bool CanDrop(const OSExchangeData& data) OVERRIDE;
|
| + std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
|
| + virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE;
|
| virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE;
|
|
|
| // Stops the timer that triggers a page flip during a drag.
|
|
|