ui/app_list/views/app_list_main_view.cc - Issue 214423002: Reset the app list when it is shown on Windows and Linux.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: fix app list folder icons disappearing on fast switch 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

« chrome/browser/ui/views/app_list/linux/app_list_linux.cc ('K') | « ui/app_list/views/app_list_main_view.h ('k') | ui/app_list/views/app_list_view.h » ('j') | ui/app_list/views/apps_container_view.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..995031545f1d09ec07c4d3adb210f88df3607462 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,10 @@ void AppListMainView::ShowAppListWhenReady() {

this, &AppListMainView::OnIconLoadingWaitTimer);

}

+void AppListMainView::ResetForShow() {

+ contents_view_->apps_container_view()->ResetForShow();

void AppListMainView::Close() {

icon_loading_wait_timer_.Stop();

contents_view_->CancelDrag();