From 10582c429d679c7cb101983d0644095bee94a7dd Mon Sep 17 00:00:00 2001 From: "jennyz@chromium.org" Date: Wed, 19 Mar 2014 18:15:52 +0000 Subject: [PATCH] Disable pinning app list folder onto the shelf. BUG=346534 R=xiyuan@chromium.org Review URL: https://codereview.chromium.org/203093005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258041 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/app_list/views/apps_grid_view.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc index 7158889c745b..01dc43a10ef5 100644 --- a/ui/app_list/views/apps_grid_view.cc +++ b/ui/app_list/views/apps_grid_view.cc @@ -1506,6 +1506,9 @@ void AppsGridView::DispatchDragEventToDragAndDropHost( drag_and_drop_host_->EndDrag(true); } } else { + if (IsFolderItem(drag_view_->item())) + return; + // The event happened outside our app menu and we might need to dispatch. if (forward_events_to_drag_and_drop_host_) { // Dispatch since we have already started. -- 2.11.4.GIT