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

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

Issue 214423002: Reset the app list when it is shown on Windows and Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_app_list_folder_drag_for_real
Patch Set: small change for tapted@ Created 6 years, 9 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_main_view.cc
diff --git a/ui/app_list/views/app_list_main_view.cc b/ui/app_list/views/app_list_main_view.cc
index 1e83d640c0b607bcaec789c73c2ea08837435209..568c2175a4d2cdb9b84417c2836d90c7ce8db1b4 100644
--- a/ui/app_list/views/app_list_main_view.cc
+++ b/ui/app_list/views/app_list_main_view.cc
@@ -20,6 +20,7 @@
#include "ui/app_list/pagination_model.h"
#include "ui/app_list/search_box_model.h"
#include "ui/app_list/views/app_list_item_view.h"
+#include "ui/app_list/views/apps_container_view.h"
#include "ui/app_list/views/contents_switcher_view.h"
#include "ui/app_list/views/contents_view.h"
#include "ui/app_list/views/search_box_view.h"
@@ -137,6 +138,13 @@ void AppListMainView::ShowAppListWhenReady() {
this, &AppListMainView::OnIconLoadingWaitTimer);
}
+void AppListMainView::ResetForShow() {
+ contents_view_->apps_container_view()->ResetForShow();
+ // We clear the search when hiding so when app list appears it is not showing
+ // search results.
+ search_box_view_->ClearSearch();
+}
+
void AppListMainView::Close() {
icon_loading_wait_timer_.Stop();
contents_view_->CancelDrag();

Powered by Google App Engine
This is Rietveld 408576698