From 4942042b910c2b37552b66f7921a6de81e4abcaa Mon Sep 17 00:00:00 2001 From: "jennyz@chromium.org" Date: Thu, 10 Apr 2014 00:29:22 +0000 Subject: [PATCH] We should not try to change folder view's UI state if it is hidden for reparenting. The crash happens due to the |activated_view_| in top level grid view is removed since the associated folder item is removed, but the |activated_view_| is not reset to NULL. To completely prevent the similar issue, we should also integrate calamity's r261571. BUG=360887 Review URL: https://codereview.chromium.org/231233004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262876 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/app_list/views/app_list_folder_view.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app_list/views/app_list_folder_view.cc b/ui/app_list/views/app_list_folder_view.cc index c7958406b6c0c5..015f72c82137b8 100644 --- a/ui/app_list/views/app_list_folder_view.cc +++ b/ui/app_list/views/app_list_folder_view.cc @@ -141,7 +141,7 @@ void AppListFolderView::OnAppListItemWillBeDeleted(AppListItem* item) { folder_item_ = NULL; // Do not change state if it is hidden. - if (layer()->opacity() == 0.0f) + if (hide_for_reparent_ || layer()->opacity() == 0.0f) return; // If the folder item associated with this view is removed from the model,