Skip to content

Commit

Permalink
We should not try to change folder view's UI state if it is hidden fo…
Browse files Browse the repository at this point in the history
…r 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
  • Loading branch information
jennyz@chromium.org committed Apr 10, 2014
1 parent 0dcb1a8 commit 4942042
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ui/app_list/views/app_list_folder_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 4942042

Please sign in to comment.