Index: ui/app_list/views/app_list_view.cc |
diff --git a/ui/app_list/views/app_list_view.cc b/ui/app_list/views/app_list_view.cc |
index 128b018f2dcde90c6ba3207842482f48d98945ee..94c6aab138315761da61dc48088192db8ce23d42 100644 |
--- a/ui/app_list/views/app_list_view.cc |
+++ b/ui/app_list/views/app_list_view.cc |
@@ -848,6 +848,15 @@ void AppListView::SetState(AppListState new_state) { |
break; |
case FULLSCREEN_ALL_APPS: |
new_widget_bounds.set_y(0); |
+ if (app_list_main_view() |
+ ->contents_view() |
+ ->apps_container_view() |
+ ->IsInFolderView()) |
+ app_list_main_view() |
vadimt
2017/06/22 00:36:12
Add {}
newcomer
2017/06/22 16:49:06
Done.
|
+ ->contents_view() |
+ ->apps_container_view() |
+ ->app_list_folder_view() |
+ ->CloseFolderPage(); |
app_list_main_view_->contents_view()->SetActiveState( |
AppListModel::STATE_APPS); |
break; |