Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(476)

Unified Diff: ui/app_list/views/app_list_view.cc

Issue 2951903004: Added back button when in folder view. (Closed)
Patch Set: Added back button when in folder view. Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..98b8e1ceaef445fa43b1cdbf379af445fd4d16e8 100644
--- a/ui/app_list/views/app_list_view.cc
+++ b/ui/app_list/views/app_list_view.cc
@@ -848,6 +848,16 @@ 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()
+ ->contents_view()
+ ->apps_container_view()
vadimt 2017/06/22 18:28:08 Actually, please create a var for the common part:
newcomer 2017/06/23 23:28:08 Done.
+ ->app_list_folder_view()
+ ->CloseFolderPage();
+ }
app_list_main_view_->contents_view()->SetActiveState(
AppListModel::STATE_APPS);
break;

Powered by Google App Engine
This is Rietveld 408576698