diff options
| author | calamity@chromium.org <calamity@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-10 03:38:19 +0000 |
|---|---|---|
| committer | calamity@chromium.org <calamity@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-10 03:38:19 +0000 |
| commit | be266584d9895840cf7bbcd8a231a69a7793318b (patch) | |
| tree | 8c9a548d31d91eac4c1f1a2572d8999ec3846093 /ui/app_list | |
| parent | 0b15f2c7597adec8e2f957011c6a4fb1246f0347 (diff) | |
| download | chromium_src-be266584d9895840cf7bbcd8a231a69a7793318b.zip chromium_src-be266584d9895840cf7bbcd8a231a69a7793318b.tar.gz chromium_src-be266584d9895840cf7bbcd8a231a69a7793318b.tar.bz2 | |
Disallow dragging app list folder to the taskbar for the Windows app list.
This CL prevents the dragging of app list folders to the Windows taskbar
by disabling synchronous drags for folders.
BUG=371665
Review URL: https://codereview.chromium.org/279673002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269515 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/app_list')
| -rw-r--r-- | ui/app_list/views/apps_grid_view.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc index 1637f1d..ec0231e 100644 --- a/ui/app_list/views/apps_grid_view.cc +++ b/ui/app_list/views/apps_grid_view.cc @@ -477,6 +477,10 @@ void AppsGridView::StartSettingUpSynchronousDrag() { if (!delegate_) return; + // Folders can't be integrated with the OS. + if (IsFolderItem(drag_view_->item())) + return; + // Favor the drag and drop host over native win32 drag. For the Win8/ash // launcher we want to have ashes drag and drop over win32's. if (drag_and_drop_host_) |