ui/app_list/views/app_list_main_view.cc - Issue 958133005: Fix custom launcher pages showing when setEnabled(false) is called.

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 958133005: Fix custom launcher pages showing when setEnabled(false) is called. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@tab_focus_SOLVED

Patch Set: make into minimal diff fix Created 5 years, 10 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 df9f32b49734ed99b4df132e90fb4f3d58072eb3..dceae0faa72d4f49bddc4e827b990d5bc0c64783 100644

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

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

@@ -271,7 +271,7 @@ void AppListMainView::OnCustomLauncherPageEnabledStateChanged(bool enabled) {

if (!custom_page)

return;

- if (enabled) {

+ if (ShouldShowCustomLauncherPage()) {

// Make the custom page view visible again.

custom_page->SetVisible(true);

} else if (contents_view_->IsStateActive(

« no previous file with comments | « no previous file | no next file » | no next file with comments »