ui/app_list/views/apps_grid_view.cc - Issue 1003393002: After uninstall, remove last item in Launcher folder

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/apps_grid_view.cc

Issue 1003393002: After uninstall, remove last item in Launcher folder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More revisions, remove unneeded function Created 5 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/apps_grid_view.cc

diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc

index 1c6f193c818044c20a7ee611d1e161df32919942..9d8a3feafe46ce7e83cd5bcc8f66b307d8caf5d2 100644

--- a/ui/app_list/views/apps_grid_view.cc

+++ b/ui/app_list/views/apps_grid_view.cc

@@ -1623,7 +1623,9 @@ void AppsGridView::EndDragForReparentInHiddenFolderGridView() {

void AppsGridView::OnFolderItemRemoved() {

DCHECK(folder_delegate_);

- item_list_ = NULL;

+ if (item_list_)

+ item_list_->RemoveObserver(this);

+ item_list_ = nullptr;

}

void AppsGridView::StartDragAndDropHostDrag(const gfx::Point& grid_location) {

« no previous file with comments | « ui/app_list/app_list_model_unittest.cc ('k') | no next file » | no next file with comments »