| 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 580290100526c5a643dbb717b536c8ab73b515c7..27c592bd9798b1004c4bca955a25f5ebd20d1689 100644
|
| --- a/ui/app_list/views/apps_grid_view.h
|
| +++ b/ui/app_list/views/apps_grid_view.h
|
| @@ -30,11 +30,6 @@
|
| #include "ui/views/view.h"
|
| #include "ui/views/view_model.h"
|
|
|
| -#if defined(OS_WIN)
|
| -#include <wrl/client.h>
|
| -#include "ui/base/dragdrop/drag_source_win.h"
|
| -#endif
|
| -
|
| namespace views {
|
| class ButtonListener;
|
| class DragImageView;
|
| @@ -42,10 +37,6 @@ class DragImageView;
|
|
|
| namespace app_list {
|
|
|
| -#if defined(OS_WIN)
|
| -class SynchronousDrag;
|
| -#endif
|
| -
|
| namespace test {
|
| class AppsGridViewTestApi;
|
| }
|
| @@ -462,14 +453,6 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
|
| // Returns true if the grid view is under an OEM folder.
|
| bool IsUnderOEMFolder();
|
|
|
| - void StartSettingUpSynchronousDrag();
|
| - bool RunSynchronousDrag();
|
| - void CleanUpSynchronousDrag();
|
| -#if defined(OS_WIN)
|
| - void OnGotShortcutPath(Microsoft::WRL::ComPtr<SynchronousDrag> drag,
|
| - const base::FilePath& path);
|
| -#endif
|
| -
|
| AppListModel* model_; // Owned by AppListView.
|
| AppListItemList* item_list_; // Not owned.
|
| AppsGridViewDelegate* delegate_;
|
| @@ -510,15 +493,6 @@ class APP_LIST_EXPORT AppsGridView : public views::View,
|
| // Page the drag started on.
|
| int drag_start_page_;
|
|
|
| -#if defined(OS_WIN)
|
| - // Created when a drag is started (ie: drag exceeds the drag threshold), but
|
| - // not Run() until supplied with a shortcut path.
|
| - Microsoft::WRL::ComPtr<SynchronousDrag> synchronous_drag_;
|
| -
|
| - // Whether to use SynchronousDrag to support dropping to task bar etc.
|
| - bool use_synchronous_drag_;
|
| -#endif
|
| -
|
| Pointer drag_pointer_;
|
|
|
| // The most recent reorder drop target.
|
|
|